X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fobdclass%2FMakefile.in;h=2c7f0d2ff4ef62e752fd3c1b26d3b3de548cbccf;hb=c159c408293fbebf71a948e630aa9f637f3c8ffe;hp=00b8a00ae2a4fe3e1ad535e79bd616a7a7ae38d2;hpb=7c4035f317111463f62b708f073cee8ef01e52dd;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/Makefile.in b/lustre/obdclass/Makefile.in
index 00b8a00..2c7f0d2 100644
--- a/lustre/obdclass/Makefile.in
+++ b/lustre/obdclass/Makefile.in
@@ -1,17 +1,39 @@
-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 class_hash.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 mea.o
+obdclass-all-objs += lu_object.o dt_object.o hash.o capa.o lu_time.o
+obdclass-all-objs += cl_object.o cl_page.o cl_lock.o cl_io.o lu_ref.o
+obdclass-all-objs += acl.o idmap.o
+obdclass-all-objs += md_local_object.o
+
+obdclass-objs := $(obdclass-linux-objs) $(obdclass-all-objs)
 
+EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFS_DIR@ -I@LDISKFS_DIR@/ldiskfs
+
+ifeq ($(PATCHLEVEL),6)
 llog_test-objs := llog-test.o
 
 $(obj)/llog-test.c: $(obj)/llog_test.c