X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flvfs%2FautoMakefile.am;h=c684b504ced03809716ffc3534522c32f6603732;hb=8d334f67052ccf77713c780a8040593728977599;hp=001fc7ea28835d9e939f30e6aa616dd82dcf2c7f;hpb=0f8dca08a4f68cba82c2c822998ecc309d3b7aaf;p=fs%2Flustre-release.git

diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
index 001fc7e..c684b50 100644
--- a/lustre/lvfs/autoMakefile.am
+++ b/lustre/lvfs/autoMakefile.am
@@ -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,9 +52,9 @@ if LINUX
 modulefs_DATA := lvfs$(KMODEXT)
 
 if SERVER
-modulefs_DATA += fsfilt_$(BACKINGFS)$(KMODEXT)
+modulefs_DATA += fsfilt_ldiskfs$(KMODEXT)
 
-sources: fsfilt_$(BACKINGFS).c
+sources: fsfilt_ldiskfs.c
 	touch sources
 
 else #SERVER
@@ -63,20 +63,12 @@ sources:
 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/EXT4/LDISKFS/g" -e "s/ext4/ldiskfs/g" \
-	-e "s/HAVE_LDISKFS_LDISKFS/HAVE_EXT4_LDISKFS/g"
+	-e "s/EXT4/LDISKFS/g" -e "s/ext4/ldiskfs/g"
 
 fsfilt_ldiskfs.c: fsfilt_ext3.c
 	sed $(strip $(ldiskfs_sed_flags)) $< > $@
-	if grep -q '^#define\(.*\)HAVE_EXT4_LDISKFS' @LDISKFS_DIR@/config.h ; then \
-		sed -i -e "/DEBUG_SUBSYSTEM\(.*\)S_FILTER/a\#define HAVE_EXT4_LDISKFS 1" $@ ;\
-	fi
+
 fsfilt_ldiskfs_quota.h: fsfilt_ext3_quota.h
 	sed $(strip $(ldiskfs_sed_flags)) $< > $@
 
@@ -84,17 +76,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