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

[fs/lustre-release.git] / lustre / lvfs / autoMakefile.am

diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
index 1b5311b..8b8c649 100644 (file)
--- a/lustre/lvfs/autoMakefile.am
+++ b/lustre/lvfs/autoMakefile.am
@@ -25,7 +25,7 @@
 #
 
 #
-# Copyright  2008 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -36,7 +36,7 @@
 
 if LIBLUSTRE
 noinst_LIBRARIES = liblvfs.a
-liblvfs_a_SOURCES = lvfs_userfs.c prng.c lvfs_lib.c
+liblvfs_a_SOURCES = lvfs_userfs.c lvfs_lib.c
 liblvfs_a_CFLAGS = $(LLCFLAGS)
 liblvfs_a_CPPFLAGS = $(LLCPPFLAGS)
 
@@ -52,26 +52,26 @@ if LINUX
 modulefs_DATA := lvfs$(KMODEXT)
 
 if SERVER
-modulefs_DATA += fsfilt_$(BACKINGFS)$(KMODEXT)
+if LDISKFS_ENABLED
+modulefs_DATA += fsfilt_ldiskfs$(KMODEXT)
 
-sources: fsfilt_$(BACKINGFS).c
+sources: fsfilt_ldiskfs.c
        touch sources
-
+else #LDISKFS_ENABLED
+sources:
+endif #LDISKFS_ENABLED
 else #SERVER
 sources:
 
-endif
+endif #SERVER
 
 ldiskfs_sed_flags = \
-       -e "s/dx_hash_info/ext3_dx_hash_info/g" \
-       -e "s/dir_private_info/ext3_dir_private_info/g" \
-       -e "s/DX_HASH/EXT3_DX_HASH/g" \
-       -e "s/reserve_window/ext3_reserve_window/g" \
-       -e "s/rsv_window_add/ext3_rsv_window_add/g" \
-       -e "s/EXT3/LDISKFS/g" -e "s/ext3/ldiskfs/g"
+       -e "s/EXT3/LDISKFS/g" -e "s/ext3/ldiskfs/g" \
+       -e "s/EXT4/LDISKFS/g" -e "s/ext4/ldiskfs/g"
 
 fsfilt_ldiskfs.c: fsfilt_ext3.c
        sed $(strip $(ldiskfs_sed_flags)) $< > $@
+
 fsfilt_ldiskfs_quota.h: fsfilt_ext3_quota.h
        sed $(strip $(ldiskfs_sed_flags)) $< > $@
 
@@ -79,17 +79,17 @@ endif # LINUX
 
 if DARWIN
 
-macos_PROGRAMS := lvfs
+macos_PROGRAMS = lvfs
 
-lvfs_SOURCES := lvfs_darwin.c
+lvfs_SOURCES = lvfs_darwin.c
 
 lvfs_CFLAGS := $(EXTRA_KCFLAGS)
 lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
 lvfs_LDADD := $(EXTRA_KLIBS)
 
-plist_DATA := Info.plist
+plist_DATA = Info.plist
 
-install_data_hook := fix-kext-ownership
+install_data_hook = fix-kext-ownership
 
 endif # DARWIN
 
@@ -101,11 +101,5 @@ endif # MODULES
 
 install-data-hook: $(install_data_hook)
 
-DIST_SOURCES = fsfilt.c fsfilt_ext3.c fsfilt_reiserfs.c lvfs_common.c \
-       lvfs_internal.h lvfs_linux.c lvfs_userfs.c \
-       upcall_cache.c prng.c lvfs_lib.c \
-       lustre_quota_fmt.c lustre_quota_fmt.h quotafmt_test.c \
-        # quotacheck_test.c quotactl_test.c fsfilt_ext3_quota.h
-
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 CLEANFILES = fsfilt-*.c fsfilt_ldiskfs*.c fsfilt_extN.c sources