X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FMakefile.am;h=69d5b5134342c2467db27194542d87c9be690d1e;hb=8602aad84cd0ae57ed1eade67c20d3e6c384d9f5;hp=266acf63ffa78dfd80fb4459e4e28dd76ef03c99;hpb=9bb4c2413323c2bc7bb0686ab6b86f0ca6215781;p=fs%2Flustre-release.git

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index 266acf6..69d5b51 100644
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -5,14 +5,39 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-# NOTE: keep extN before mds
-SUBDIRS = lov utils obdclass ldlm ptlrpc llite lib obdecho mdc osc extN 
-SUBDIRS+=  mds ost tests obdfilter demos doc scripts 
-DIST_SUBDIRS = $(SUBDIRS)
-EXTRA_DIST = BUGS FDL Rules include patches archdep.m4
+if LINUX25
+DIRS24 = 
+else
+DIRS24 = ptlbd
+endif
+
+# just until things are farther along
+if CRAY_PORTALS
+UTILS_TESTS = 
+else
+UTILS_TESTS = utils tests
+endif
+
+if LIBLUSTRE
+SUBDIRS = portals obdclass lov ptlrpc obdecho osc utils mdc lvfs liblustre
+else
+SUBDIRS = lvfs portals obdclass include $(DIRS24) mds obdfilter mdc osc ost 
+SUBDIRS+= llite obdecho lov cobd doc scripts conf ptlrpc $(UTILS_TESTS)
+endif
+
+
+if SNAPFS
+SUBDIRS+= snapfs
+endif
+
+if SMFS 
+SUBDIRS += smfs
+endif
+DIST_SUBDIRS = $(SUBDIRS) liblustre snapfs smfs
+EXTRA_DIST = BUGS FDL Rules kernel_patches
 
 # We get the version from the spec file.
-configure: scripts/lustre.spec.in
+CONFIGURE_DEPENDENCIES = scripts/lustre.spec.in
 
 dist-hook:
 	find $(distdir) -name .deps | xargs rm -rf
@@ -21,5 +46,21 @@ dist-hook:
 include $(top_srcdir)/Rules
 
 rpms: dist Makefile
-	rpm -ta $(distdir).tar.gz
+	rpmbuild -ta $(distdir).tar.gz
+
+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}