Branch b1_4_mountconf

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

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 8211b00..da1f00d 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -5,12 +5,37 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = include ldiskfs lvfs obdclass lov ldlm ptlrpc      \
-       obdecho osc mdc lmv  mds obdfilter ost llite cobd ptlbd smfs snapfs \
-       cmobd liblustre doc utils tests conf scripts autoconf
+ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
+       mgc doc utils tests conf scripts autoconf
 
-EXTRA_DIST = BUGS FDL Rules.in kernel_patches \
-       README.kernel-source
+SERVER_SUBDIRS := ldiskfs obdfilter ost mds mgs
+
+CLIENT_SUBDIRS := mdc llite
+
+LIBLUSTRE_SUBDIRS := liblustre
+
+SUBDIRS := $(ALWAYS_SUBDIRS)
+
+if SERVER
+SUBDIRS += $(SERVER_SUBDIRS)
+endif
+
+if CLIENT
+SUBDIRS += $(CLIENT_SUBDIRS)
+endif
+
+# this needs to be after the client subdirs
+if LIBLUSTRE
+if !CLIENT
+SUBDIRS += $(CLIENT_SUBDIRS)
+endif
+SUBDIRS += $(LIBLUSTRE_SUBDIRS)
+endif
+
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)  \
+       $(LIBLUSTRE_SUBDIRS)
+
+EXTRA_DIST = BUGS FDL kernel_patches
 
 if LDISKFS
 LDISKFS = ldiskfs-sources
@@ -38,7 +63,7 @@ CSTKO=/tmp/checkstack.orig
 
 checkstack:
        [ -f ${CSTK} -a ! -s ${CSTKO} ] && mv ${CSTK} ${CSTKO} || true
-       for i in ${SUBDIRS} portals/knals/*; do                              \
+       for i in ${SUBDIRS} lnet/klnds/*; do                                 \
                MOD=$$i/`basename $$i`.o;                                    \
                [ -f $$MOD ] && objdump -d $$MOD | perl tests/checkstack.pl; \
        done | sort -nr > ${CSTK}