X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=118b82c783f11959afb824eb3db56b4c1bd2040f;hp=6601397bbb32cf7a6ccca93dba391af2a03c52ac;hb=54320d7f52e6dd2b32e64997e2f7ae1ff1060f6f;hpb=e7bcca820b8c4d48b98c8578fafb9a823c490bb0

diff --git a/autoMakefile.am b/autoMakefile.am
index 6601397b..118b82c 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,38 +1,48 @@
-SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre 
+SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @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@
-if LDISKFS_ENABLED
-EXTRA_SOURCES := @SYMVERFILE@
-endif
+RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
+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
 
 EXTRA_DIST += config.h.in
 
-if LDISKFS_ENABLED
-@SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
-	touch @SYMVERFILE@
-	-grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old
-	cat @SYMVERFILE@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
+if USES_DPKG
+EXTRA_DIST += debian/*
 endif
 
+module-symvers-ldiskfs:
+if LDISKFS_ENABLED
+	@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: module-symvers-ldiskfs
+
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig
 
 checkstack:
 	[ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
-	{ for i in lustre/* lnet/* libcfs/*; do					     \
-		MOD=$$i/`basename $$i`;					     \
-		if [ $$i = "lustre/llite" ]; then MOD=$$i/lustre; fi;        \
-		[ -f $$MOD.ko ] && MOD=$$MOD.ko || MOD=$$MOD.o;		     \
-		[ -f $$MOD ] && objdump -d $$MOD | perl build/checkstack.pl; \
-	  done;								     \
-	  for i in lnet/klnds/*; do					     \
-		MOD=$$i/k`basename $$i`;				     \
-		[ -f $$MOD.ko ] && MOD=$$MOD.ko || MOD=$$MOD.o;		     \
-		[ -f $$MOD ] && objdump -d $$MOD | perl build/checkstack.pl; \
-	  done } | sort -nr > ${CSTK}
+	{ for MOD in $$(find . -name "*.ko"); do			     \
+		objdump -d $$MOD | perl build/checkstack.pl;                 \
+	  done } | grep -v " bug " | sort -nr | uniq > ${CSTK}
 	[ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
 
 checkstack-update:
@@ -40,3 +50,15 @@ checkstack-update:
 
 checkstack-clean:
 	rm -f ${CSTK} ${CSTKO}
+
+module-dist-hook:
+	if [ -d CVS -o -d .git ]; then \
+	    perl lustre/scripts/make_META.pl > $(distdir)/META; \
+	    cp $(distdir)/META $(distdir)/ldiskfs/META; \
+	elif [ -f META ]; then \
+	    cp META $(distdir)/META; \
+	    cp $(distdir)/META $(distdir)/ldiskfs/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; \
+	fi