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

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index 1582666..4410599 100644
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -5,38 +5,93 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-if LINUX25
-DIRS24 = 
+DIST_SUBDIRS = 
+SUBDIRS = include portals conf scripts ldlm
+
+# ldiskfs creates headers that the ldiskfs fsfilt will need
+if MODULES
+if LDISKFS
+SUBDIRS += ldiskfs
+else
+DIST_SUBDIRS += ldiskfs
+endif
 else
-DIRS24 = ptlbd
+DIST_SUBDIRS += ldiskfs
 endif
 
+# directories shared by the liblustre and modules builds
+CORE_SUBDIRS = lvfs obdclass lov ptlrpc obdecho osc mdc
 if LIBLUSTRE
-SUBDIRS = portals obdclass lov ptlrpc obdecho  osc utils mdc lvfs #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
-SUBDIRS = lvfs portals obdclass include $(DIRS24) mds utils obdfilter mdc osc ost 
-SUBDIRS+= llite obdecho lov cobd tests doc scripts conf ptlrpc
+MODULES_SUBDIRS += ptlbd
 endif
 
 if SNAPFS
-SUBDIRS+= snapfs
+MODULES_SUBDIRS += snapfs
+else
+MODULES_DIST_SUBDIRS += snapfs
 endif
 
-if SMFS 
-SUBDIRS += smfs
+if SMFS
+MODULES_SUBDIRS += smfs
+else
+MODULES_DIST_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_DEPENDENCIES = scripts/lustre.spec.in
+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
 	rpmbuild -ta $(distdir).tar.gz