X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FMakefile.am;h=44105995ea82eec303ea607cc149c40c30fa9653;hb=3de901fceee79de12a31428bcc6ba3a00f10d1fe;hp=f5d2d13d9367a5ca5fdf0b4dde116b35a3506f07;hpb=5f56885a9cd3c42195c8a19c68e5b3d07a9e94e8;p=fs%2Flustre-release.git

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index f5d2d13..4410599 100644
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -5,21 +5,109 @@
 
 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) obdfs
-EXTRA_DIST = BUGS FDL Rules include patches archdep.m4
+DIST_SUBDIRS = 
+SUBDIRS = include portals conf scripts ldlm
 
-# We get the version from the spec file.
-configure: scripts/lustre.spec.in
+# ldiskfs creates headers that the ldiskfs fsfilt will need
+if MODULES
+if LDISKFS
+SUBDIRS += ldiskfs
+else
+DIST_SUBDIRS += ldiskfs
+endif
+else
+DIST_SUBDIRS += ldiskfs
+endif
+
+# directories shared by the liblustre and modules builds
+CORE_SUBDIRS = lvfs obdclass lov ptlrpc obdecho osc mdc
+if LIBLUSTRE
+SUBDIRS += $(CORE_SUBDIRS)
+else
+if MODULES
+SUBDIRS += $(CORE_SUBDIRS)
+else
+DIST_SUBDIRS += $(CORE_SUBDIRS)
+endif
+endif
+
+# directories only built in the modules build
+MODULES_SUBDIRS = mds obdfilter ost llite cobd
+MODULES_DIST_SUBDIRS =
+
+if LINUX25
+MODULES_DIST_SUBDIRS += ptlbd
+else
+MODULES_SUBDIRS += ptlbd
+endif
+
+if SNAPFS
+MODULES_SUBDIRS += snapfs
+else
+MODULES_DIST_SUBDIRS += snapfs
+endif
+
+if SMFS
+MODULES_SUBDIRS += smfs
+else
+MODULES_DIST_SUBDIRS += smfs
+endif
+
+if MODULES
+SUBDIRS += $(MODULES_SUBDIRS)
+DIST_SUBDIRS += $(MODULES_DIST_SUBDIRS)
+else
+DIST_SUBDIRS += $(MODULES_SUBDIRS) $(MODULES_DIST_SUBDIRS)
+endif
+
+if LIBLUSTRE
+SUBDIRS += liblustre
+else
+DIST_SUBDIRS += liblustre
+endif
+
+if DOC
+SUBDIRS += doc
+else
+DIST_SUBDIRS += doc
+endif
+
+if UTILS
+SUBDIRS += utils
+else
+DIST_SUBDIRS += utils
+endif
+
+if TESTS
+SUBDIRS += tests
+else
+DIST_SUBDIRS += tests
+endif
+
+DIST_SUBDIRS += $(SUBDIRS)
+
+EXTRA_DIST = BUGS FDL Rules.in kernel_patches kernel-tests/Makefile
 
 dist-hook:
 	find $(distdir) -name .deps | xargs rm -rf
 	find $(distdir) -name CVS | xargs rm -rf
 
-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}