b24336 ldlm_resource::lr_lvb_data is protected by wrong lock

[fs/lustre-release.git] / autoMakefile.am

diff --git a/autoMakefile.am b/autoMakefile.am
index d979a8e..251ab1e 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -3,36 +3,35 @@ 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
+EXTRA_DIST += config.h.in debian/*
 
 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
 
 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 +39,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