LU-2068 build: Respect "--without-ldiskfs" option

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

diff --git a/lustre/lvfs/Makefile.in b/lustre/lvfs/Makefile.in
index 6a8feb5..cd2b0d8 100644 (file)
--- a/lustre/lvfs/Makefile.in
+++ b/lustre/lvfs/Makefile.in
@@ -1,22 +1,18 @@
 MODULES := lvfs
-@SERVER_TRUE@MODULES += fsfilt_@BACKINGFS@
-@LDISKFS_TRUE@MODULES += fsfilt_ldiskfs2
-@QUOTA_TRUE@MODULES += quotafmt_test
+@LDISKFS_ENABLED_TRUE@MODULES += fsfilt_ldiskfs
 
-lvfs-objs := lvfs_common.o lvfs_linux.o fsfilt.o upcall_cache.o
-@QUOTA_TRUE@lvfs-objs += lustre_quota_fmt.o
+lvfs-objs := lvfs_common.o lvfs_linux.o fsfilt.o lvfs_lib.o
 
-@QUOTA_TRUE@quotafmt-objs := quotafmt_test.o
-
-ifeq ($(PATCHLEVEL),6)
-fsfilt_@BACKINGFS@-objs := fsfilt-@BACKINGFS@.o
-fsfilt_ldiskfs2-objs := fsfilt-ldiskfs2.o
+@LDISKFS_ENABLED_TRUE@fsfilt_ldiskfs-objs := fsfilt-ldiskfs.o
 
 $(obj)/fsfilt-%.c: $(obj)/fsfilt_%.c
        ln -s $< $@
-endif
+
+EXTRA_DIST = $(lvfs-objs:.o=.c)  \
+       fsfilt_ext3.c \
+       lvfs_internal.h lvfs_userfs.c
 
 # for <ext3/xattr.h> on 2.6
-EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LUSTRE@ -I@LUSTRE@/ldiskfs -I@LUSTRE@/ldiskfs2
+EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFS_DIR@ -I@LDISKFS_DIR@/ldiskfs
 
 @INCLUDE_RULES@