land b1_5 onto HEAD

[fs/lustre-release.git] / lustre / obdclass / Makefile.in

diff --git a/lustre/obdclass/Makefile.in b/lustre/obdclass/Makefile.in
index 00b8a00..a33afd2 100644 (file)
--- a/lustre/obdclass/Makefile.in
+++ b/lustre/obdclass/Makefile.in
@@ -1,17 +1,33 @@
-MODULES := obdclass llog_test confobd
-
-obdclass-objs := llog_obd.o class_obd.o llog_swab.o
-obdclass-objs += debug.o genops.o sysctl.o uuid.o llog_ioctl.o
-obdclass-objs += lprocfs_status.o lustre_handles.o lustre_peer.o
-obdclass-objs += statfs_pack.o obdo.o obd_config.o mea.o capa.o
+MODULES := obdclass llog_test
 
+obdclass-linux-objs := linux-module.o linux-obdo.o linux-sysctl.o
 ifeq ($(PATCHLEVEL),6)
+obdclass-linux-objs := $(addprefix linux/,$(obdclass-linux-objs))
+endif
 
-confobd-objs := conf_obd.o
+default: all
 
-$(obj)/conf_obd.c: $(obj)/confobd.c
-       ln -sf $< $@
+ifeq (@linux25@,no)
+sources:
+       @for i in $(obdclass-linux-objs:%.o=%.c) ; do \
+               echo "ln -s @srcdir@/linux/$$i ." ; \
+               ln -sf @srcdir@/linux/$$i . || exit 1 ; \
+       done
 
+else
+sources:
+
+endif
+
+obdclass-all-objs := llog.o llog_cat.o llog_lvfs.o llog_obd.o llog_swab.o
+obdclass-all-objs += class_obd.o
+obdclass-all-objs += debug.o genops.o uuid.o llog_ioctl.o
+obdclass-all-objs += lprocfs_status.o lustre_handles.o lustre_peer.o
+obdclass-all-objs += statfs_pack.o obdo.o obd_config.o obd_mount.o prng.o
+
+obdclass-objs := $(obdclass-linux-objs) $(obdclass-all-objs)
+
+ifeq ($(PATCHLEVEL),6)
 llog_test-objs := llog-test.o
 
 $(obj)/llog-test.c: $(obj)/llog_test.c