X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2FMakefile.am;h=59411e7762bc30e89cc835cfc09d6aa0f816344c;hb=36bdc5a55f831101b566a22c7914873e19264b3e;hp=fee3eabd52c6f7f16fafbc9a40667c24abe65bd5;hpb=4bca5fdb4c47c998972a8670726b9b67492d9c1d;p=fs%2Flustre-release.git

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index fee3eab..59411e7 100644
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -5,13 +5,21 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+if LINUX25
+DIRS24 = mds
+else
+DIRS24 = extN mds
+endif
+
 # 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 #obdfs
+SUBDIRS = lov utils obdclass ldlm ptlrpc lib obdecho mdc osc ost llite 
+SUBDIRS+=   $(DIRS24) mds obdfilter tests doc scripts 
+
+DIST_SUBDIRS = $(SUBDIRS)
 EXTRA_DIST = BUGS FDL Rules include patches archdep.m4
 
 # 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