LU-723 Enhance lustre/ldiskfs build system

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

diff --git a/lustre/lvfs/Makefile.in b/lustre/lvfs/Makefile.in
index dd2128e..482d73a 100644 (file)
--- a/lustre/lvfs/Makefile.in
+++ b/lustre/lvfs/Makefile.in
@@ -1,18 +1,23 @@
-MODULES := lvfs fsfilt_@BACKINGFS@ fsfilt_smfs
+MODULES := lvfs
+@SERVER_TRUE@MODULES += fsfilt_ldiskfs
+@QUOTA_TRUE@MODULES += quotafmt_test

 
 

-lvfs-objs := fsfilt.o lvfs_common.o llog_lvfs.o lvfs_linux.o 
-lvfs-objs += llog.o llog_cat.o 
+lvfs-objs := lvfs_common.o lvfs_linux.o fsfilt.o lvfs_lib.o

 
 

-ifeq ($(PATCHLEVEL),6)
-fsfilt_@BACKINGFS@-objs := fsfilt-@BACKINGFS@.o
+@QUOTA_TRUE@quotafmt-objs := quotafmt_test.o
+
+fsfilt_ldiskfs-objs := fsfilt-ldiskfs.o
+@QUOTA_TRUE@fsfilt_ldiskfs-objs += lustre_quota_fmt.o

 
 $(obj)/fsfilt-%.c: $(obj)/fsfilt_%.c
        ln -s $< $@
 
 $(obj)/fsfilt-%.c: $(obj)/fsfilt_%.c
        ln -s $< $@

-endif

 
 

-fsfilt_smfs-objs := fsfilt-smfs.o
+EXTRA_DIST = $(lvfs-objs:.o=.c)  $(quotafmt-objs:.o=.c) \
+       fsfilt_ext3.c fsfilt_reiserfs.c \
+       lvfs_internal.h lvfs_userfs.c \
+       lustre_quota_fmt.c lustre_quota_fmt.h quotafmt_test.c

 
 # for <ext3/xattr.h> on 2.6
 
 # for <ext3/xattr.h> on 2.6

-EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LUSTRE@ -I@LUSTRE@/ldiskfs
+EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFS_DIR@ -I@LDISKFS_DIR@/ldiskfs

 
 @INCLUDE_RULES@
 
 @INCLUDE_RULES@