Patch for tinderbox

[fs/lustre-release.git] / lustre / Makefile.am

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index fee3eab..59411e7 100644 (file)
--- 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