X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=autoMakefile.am;h=60d0a4a5bffcc6fd8be5f7b09c4f507acf38e378;hb=776a65514bf407d46e1f5442e6799788a6365ba8;hp=d40970fa7ba5144105f03d27da556eb68439fccd;hpb=0d5cf708f60c1ed9233fd12f4326851ab412ef6a;p=fs%2Flustre-release.git

diff --git a/autoMakefile.am b/autoMakefile.am
index d40970f..60d0a4a 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -6,6 +6,10 @@ MODULE_SYMVERS_DEPS = module-symvers
 
 @TESTS_TRUE@BUILD_TESTS = true
 @TESTS_FALSE@BUILD_TESTS = false
+@SERVER_TRUE@BUILD_SERVER = true
+@SERVER_FALSE@BUILD_SERVER = false
+@CLIENT_TRUE@BUILD_CLIENT = true
+@CLIENT_FALSE@BUILD_CLIENT = false
 
 include build/autoMakefile.am.toplevel
 
@@ -29,7 +33,31 @@ if LDISKFS_ENABLED
 	fi
 endif # LDISKFS_ENABLED
 
-module-symvers: module-symvers-ldiskfs
+module-symvers-zfs:
+if ZFS_ENABLED
+	@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
+		cat @SPL_OBJ@/@SPL_SYMBOLS@ >>@SYMVERFILE@; \
+	elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
+		cat @SPL_OBJ@/module/@SPL_SYMBOLS@ >>@SYMVERFILE@; \
+	else \
+		echo -e "\n" \
+		"*** Missing spl symbols. Ensure you have built spl:\n" \
+		"*** - @SPL_OBJ@/@SYMVERFILE@\n"; \
+		exit 1; \
+	fi
+	@if [ -f @ZFS_OBJ@/@ZFS_SYMBOLS@ ]; then \
+		cat @ZFS_OBJ@/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \
+	elif [ -f @ZFS_OBJ@/module/@ZFS_SYMBOLS@ ]; then \
+		cat @ZFS_OBJ@/module/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \
+	else \
+		echo -e "\n" \
+		"*** Missing zfs symbols. Ensure you have built zfs:\n" \
+		"*** - @ZFS_OBJ@/@SYMVERFILE@\n"; \
+		exit 1; \
+	fi
+endif # ZFS_ENABLED
+
+module-symvers: module-symvers-ldiskfs module-symvers-zfs
 
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig
@@ -49,12 +77,15 @@ checkstack-clean:
 
 module-dist-hook:
 	if [ -d CVS -o -d .git ]; then \
-	    perl lustre/scripts/make_META.pl > $(distdir)/META; \
-	    cp $(distdir)/META $(distdir)/ldiskfs/META; \
+		perl lustre/scripts/make_META.pl > $(distdir)/META; \
 	elif [ -f META ]; then \
-	    cp META $(distdir)/META; \
-	    cp $(distdir)/META $(distdir)/ldiskfs/META; \
+		cp META $(distdir)/META; \
 	else \
-	    echo -e "I have no idea how to create a META file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
-	    exit 1; \
+		echo -e "I have no idea how to create a META file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
+		exit 1; \
 	fi
+if LDISKFS_ENABLED
+	if [ -f $(distdir)/META -a -d $(distdir)/ldiskfs ]; then \
+		cp $(distdir)/META $(distdir)/ldiskfs/META; \
+	fi
+endif