LU-3249 tests: build POSIX test suite on FC18

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

diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
index 001fc7e..61301e3 100644 (file)
--- a/lustre/lvfs/autoMakefile.am
+++ b/lustre/lvfs/autoMakefile.am
@@ -28,6 +28,8 @@
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2012, Intel Corporation.
+#
 
 #
 # This file is part of Lustre, http://www.lustre.org/
@@ -36,13 +38,9 @@
 
 if LIBLUSTRE
 noinst_LIBRARIES = liblvfs.a
-liblvfs_a_SOURCES = lvfs_userfs.c prng.c lvfs_lib.c
+liblvfs_a_SOURCES = lvfs_lib.c
 liblvfs_a_CFLAGS = $(LLCFLAGS)
 liblvfs_a_CPPFLAGS = $(LLCPPFLAGS)
-
-#if MYSQL
-#liblvfs_a_SOURCES += lvfs_user_mysql.c
-#endif
 endif
 
 if MODULES
@@ -52,52 +50,28 @@ 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 #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)) $< > $@
 
 endif # LINUX
 
-if DARWIN
-
-macos_PROGRAMS := lvfs
-
-lvfs_SOURCES := lvfs_darwin.c
-
-lvfs_CFLAGS := $(EXTRA_KCFLAGS)
-lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
-lvfs_LDADD := $(EXTRA_KLIBS)
-
-plist_DATA := Info.plist
-
-install_data_hook := fix-kext-ownership
-
-endif # DARWIN
-
 else # MODULES
 
 sources:
@@ -106,5 +80,5 @@ endif # MODULES
 
 install-data-hook: $(install_data_hook)
 
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
 CLEANFILES = fsfilt-*.c fsfilt_ldiskfs*.c fsfilt_extN.c sources