LU-2144 utils: reset 'optind' to avoid segmentation fault

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

diff --git a/autoMakefile.am b/autoMakefile.am
index c022f52..60d0a4a 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,32 +1,72 @@
-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@
-EXTRA_SOURCES := @SYMVERFILE@
+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@ @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
 
-@SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
-       cp @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-zfs:
+if ZFS_ENABLED
+       @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
+               cat @SPL_OBJ@/@SPL_SYMBOLS@ >>@SYMVERFILE@; \
+       elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
+               cat @SPL_OBJ@/module/@SPL_SYMBOLS@ >>@SYMVERFILE@; \
+       else \
+               echo -e "\n" \
+               "*** Missing spl symbols. Ensure you have built spl:\n" \
+               "*** - @SPL_OBJ@/@SYMVERFILE@\n"; \
+               exit 1; \
+       fi
+       @if [ -f @ZFS_OBJ@/@ZFS_SYMBOLS@ ]; then \
+               cat @ZFS_OBJ@/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \
+       elif [ -f @ZFS_OBJ@/module/@ZFS_SYMBOLS@ ]; then \
+               cat @ZFS_OBJ@/module/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \
+       else \
+               echo -e "\n" \
+               "*** Missing zfs symbols. Ensure you have built zfs:\n" \
+               "*** - @ZFS_OBJ@/@SYMVERFILE@\n"; \
+               exit 1; \
+       fi
+endif # ZFS_ENABLED
+
+module-symvers: module-symvers-ldiskfs module-symvers-zfs
 
 CSTK=/tmp/checkstack
 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:
@@ -34,3 +74,18 @@ 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; \
+       elif [ -f META ]; then \
+               cp META $(distdir)/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 LDISKFS_ENABLED
+       if [ -f $(distdir)/META -a -d $(distdir)/ldiskfs ]; then \
+               cp $(distdir)/META $(distdir)/ldiskfs/META; \
+       fi
+endif