X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flvfs%2FautoMakefile.am;h=61301e3092e81e060c43a052a2ac1a668b112347;hb=390e1bbc5adaae5f05081f773e52063f0ed169ce;hp=a85d18a18a64b01f0dbfd99cdab2764dad7686fa;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git

diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
index a85d18a..61301e3 100644
--- a/lustre/lvfs/autoMakefile.am
+++ b/lustre/lvfs/autoMakefile.am
@@ -14,8 +14,8 @@
 # in the LICENSE file that accompanied this code).
 #
 # You should have received a copy of the GNU General Public License
-# version 2 along with this program; If not, see [sun.com URL with a
-# copy of GPLv2].
+# version 2 along with this program; If not, see
+# http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
 #
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
@@ -25,9 +25,11 @@
 #
 
 #
-# 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.
 #
+# 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,47 +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
+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)) $< > $@
 
 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:
@@ -101,12 +80,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@ 
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
 CLEANFILES = fsfilt-*.c fsfilt_ldiskfs*.c fsfilt_extN.c sources
-