X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=6be5e694b1a7b25dbc737c6944cdda47e3e48f3b;hb=0582f22ff1e7af274a77548725ed66d559721e5e;hp=a8197e1300e7a6b97ae406d2e33398f808899557;hpb=356b11c36639b3470c197129a92f4cf26f61d87a;p=fs%2Flustre-release.git

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index a8197e1..6be5e69 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -5,46 +5,59 @@
 
 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
+# also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
+ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
+	mgc fid fld doc utils tests scripts autoconf contrib
 
-EXTRA_DIST = BUGS FDL Rules.in kernel_patches
+SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd
 
-if LDISKFS
-LDISKFS = ldiskfs-sources
-ldiskfs-sources:
-	$(MAKE) sources -C ldiskfs
+CLIENT_SUBDIRS := mdc lmv llite
+
+QUOTA_SUBDIRS := quota
+
+LIBLUSTRE_SUBDIRS := liblustre
+
+SUBDIRS := $(ALWAYS_SUBDIRS)
+
+if SERVER
+SUBDIRS += $(SERVER_SUBDIRS)
+endif
+
+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)
+endif
+SUBDIRS += $(LIBLUSTRE_SUBDIRS)
 endif
 
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)	\
+	$(LIBLUSTRE_SUBDIRS) $(QUOTA_SUBDIRS)
+
+EXTRA_DIST = BUGS FDL kernel_patches
+
 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/lustre/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)