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

diff --git a/autoMakefile.am b/autoMakefile.am
index 5d1d839..60d0a4a 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,15 +1,15 @@
 SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs lustre-iokit @LIBCFS_SUBDIR@ lnet lustre 
+DIST_SUBDIRS := @LDISKFS_DIST_SUBDIR@ @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
-if LDISKFS_ENABLED
-if !LDISKFS_IN_KERNEL
-EXTRA_SOURCES := @SYMVERFILE@
-endif
-endif
+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
 
@@ -19,14 +19,45 @@ if USES_DPKG
 EXTRA_DIST += debian/*
 endif
 
+module-symvers-ldiskfs:
 if LDISKFS_ENABLED
-if !LDISKFS_IN_KERNEL
-@SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
-	touch @SYMVERFILE@
-	-grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old
-	cat @SYMVERFILE@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
-endif
-endif
+	@if [ -f @LDISKFS_DIR@/@SYMVERFILE@ ]; then \
+		cat @LDISKFS_DIR@/@SYMVERFILE@ >>@SYMVERFILE@; \
+	elif [ -f @LDISKFS_DIR@/ldiskfs/@SYMVERFILE@ ]; then \
+		cat @LDISKFS_DIR@/ldiskfs/@SYMVERFILE@ >>@SYMVERFILE@; \
+	else \
+		echo -e "\n" \
+		"*** Missing ldiskfs symbols. Ensure you have built ldiskfs:\n"\
+		"*** - @LDISKFS_OBJ@/ldiskfs/@SYMVERFILE@\n"; \
+		exit 1; \
+	fi
+endif # LDISKFS_ENABLED
+
+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
@@ -46,24 +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 [ -d .git ]; then \
-		build/extract_patches $(distdir); \
-		if grep -e "^--- .*\/autoconf" -e "^--- .*\/Makefile\.am" -e ".*\/configure\.ac" -e ".*\/configure\.in" $(distdir)/debian/patches/*; then \
-			cp build/autogen.sh $(distdir)/build; \
-			cp libsysio/autogen.sh $(distdir)/libsysio; \
-			cp lustre-iokit/autogen.sh $(distdir)/lustre-iokit; \
-		fi; \
-		mkdir empty; \
-		diff -urN empty $(distdir)/debian > debian.diff; \
-		rm -rf $(distdir)/debian; \
-		rmdir empty; \
+if LDISKFS_ENABLED
+	if [ -f $(distdir)/META -a -d $(distdir)/ldiskfs ]; then \
+		cp $(distdir)/META $(distdir)/ldiskfs/META; \
 	fi
+endif