X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=autoMakefile.am;h=e65baac8496e58d295778ba9b5d190a53aec7dfc;hb=cec72a356891eaa729314a7bc89c4b2aaef0a31b;hp=ab75c70e312c5f2e268d1fc94e88873e3b26c96a;hpb=de2d48b437f11dce22890dcfa30b9009a287d3a8;p=fs%2Flustre-release.git

diff --git a/autoMakefile.am b/autoMakefile.am
index ab75c70..e65baac 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,18 +1,31 @@
-SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet lustre
-DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs lnet lustre
-SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ lnet lustre
-RPM_SUBDIRS := @LDISKFS_SUBDIR@
+SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
+DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @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
+
+@TESTS_TRUE@BUILD_TESTS = true
+@TESTS_FALSE@BUILD_TESTS = false
 
 include build/autoMakefile.am.toplevel
 
 EXTRA_DIST += config.h.in
 
+if USES_DPKG
+EXTRA_DIST += debian/*
+endif
+
 if LDISKFS_ENABLED
+if !LDISKFS_IN_KERNEL
 @SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
-	cp @LDISKFS_DIR@/@SYMVERFILE@ @SYMVERFILE@
+	touch @SYMVERFILE@
+	-grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old
+	cat @SYMVERFILE@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
+endif
 endif
 
 CSTK=/tmp/checkstack
@@ -20,17 +33,9 @@ CSTKO=/tmp/checkstack.orig
 
 checkstack:
 	[ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
-	{ for i in lustre/* lnet/* ; 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:
@@ -38,3 +43,27 @@ 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
+	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; \
+	fi