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

diff --git a/autoMakefile.am b/autoMakefile.am
index 37364f8..e65baac 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -3,19 +3,30 @@ DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS
 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@
 	touch @SYMVERFILE@
 	-grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old
 	cat @SYMVERFILE@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
 endif
+endif
 
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig
@@ -24,7 +35,7 @@ checkstack:
 	[ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
 	{ for MOD in $$(find . -name "*.ko"); do			     \
 		objdump -d $$MOD | perl build/checkstack.pl;                 \
-	  done } | grep -v " bug " | sort -nru > ${CSTK}
+	  done } | grep -v " bug " | sort -nr | uniq > ${CSTK}
 	[ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
 
 checkstack-update:
@@ -35,9 +46,24 @@ checkstack-clean:
 
 module-dist-hook:
 	if [ -d CVS -o -d .git ]; then \
-	    perl lustre/scripts/tree_status.pl > $(distdir)/tree_status; \
-	elif [ -f tree_status ]; then \
-	    cp tree_status $(distdir)/tree_status; \
+	    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 tree_status file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
+	    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