Branch b1_8

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

diff --git a/autoMakefile.am b/autoMakefile.am
index 4cf28fb..f31200a 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,30 +1,21 @@
-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
-EXTRA_SOURCES := @SYMVERFILE@
-endif
-
 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@
-endif
-
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig
 
 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}
+       { 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}
        [ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
 
 checkstack-update: