land b1_5 onto HEAD

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

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 84f3c26..f0531e8 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -5,14 +5,16 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-ALWAYS_SUBDIRS := include lvfs obdclass lov ldlm sec ptlrpc          \
-       obdecho osc lmv cobd ptlbd cmobd doc utils tests conf scripts \
-       autoconf
+# also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
+ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
+       mgc doc utils tests scripts autoconf contrib
 
-SERVER_SUBDIRS := ldiskfs smfs snapfs obdfilter ost mds
+SERVER_SUBDIRS := ldiskfs obdfilter ost mds mgs
 
 CLIENT_SUBDIRS := mdc llite
 
+QUOTA_SUBDIRS := quota
+
 LIBLUSTRE_SUBDIRS := liblustre
 
 SUBDIRS := $(ALWAYS_SUBDIRS)
@@ -25,6 +27,11 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
+if QUOTA
+SUBDIRS += $(QUOTA_SUBDIRS)
+endif
+
+# this needs to be after the client subdirs
 if LIBLUSTRE
 if !CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
@@ -32,10 +39,10 @@ endif
 SUBDIRS += $(LIBLUSTRE_SUBDIRS)
 endif
 
-DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) \
-       $(LIBLUSTRE_SUBDIRS)
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)  \
+       $(LIBLUSTRE_SUBDIRS) $(QUOTA_SUBDIRS)
 
-EXTRA_DIST = BUGS FDL Rules.in kernel_patches
+EXTRA_DIST = BUGS FDL kernel_patches
 
 if LDISKFS
 LDISKFS = ldiskfs-sources
@@ -45,32 +52,18 @@ endif
 
 lvfs-sources:
        $(MAKE) sources -C lvfs
+obdclass-sources:
+       $(MAKE) sources -C obdclass
 
-sources: $(LDISKFS) lvfs-sources lustre_build_version
+sources: $(LDISKFS) lvfs-sources obdclass-sources lustre_build_version
 
 all-recursive: lustre_build_version
 
+BUILD_VER_H=$(top_builddir)/lustre/include/linux/lustre_build_version.h
+
 lustre_build_version:
        perl $(top_builddir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
        echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
-       cmp -s $(top_builddir)/lustre/include/linux/lustre_build_version.h tmpver \
-                2> /dev/null &&                                            \
-                $(RM) tmpver ||                                            \
-                mv tmpver $(top_builddir)/lustre/include/linux/lustre_build_version.h
-
-CSTK=/tmp/checkstack
-CSTKO=/tmp/checkstack.orig
-
-checkstack:
-       [ -f ${CSTK} -a ! -s ${CSTKO} ] && mv ${CSTK} ${CSTKO} || true
-       for i in ${SUBDIRS} portals/knals/*; do                              \
-               MOD=$$i/`basename $$i`.o;                                    \
-               [ -f $$MOD ] && objdump -d $$MOD | perl tests/checkstack.pl; \
-       done | sort -nr > ${CSTK}
-       [ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
-
-checkstack-update:
-       [ -f ${CSTK} ] && mv ${CSTK} ${CSTKO}
-
-checkstack-clean:
-       rm -f ${CSTK} ${CSTKO}
+       cmp -s $(BUILD_VER_H) tmpver > tmpdiff 2> /dev/null &&          \
+                $(RM) tmpver tmpdiff ||                                        \
+               mv -f tmpver $(BUILD_VER_H)