merge b_devel into HEAD. Includes:

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

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index 541be49..7ad7358 100644 (file)
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -5,11 +5,25 @@
 
 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 doc scripts
-DIST_SUBDIRS = $(SUBDIRS)
-EXTRA_DIST = BUGS FDL Rules include patches archdep.m4
+if LINUX25
+DIRS24 = 
+else
+DIRS24 = extN ptlbd
+endif
+
+if LIBLUSTRE
+#SUBDIRS = lov obdclass ptlrpc obdecho ldlm osc liblustre utils
+SUBDIRS = lov obdclass ptlrpc obdecho ldlm osc utils
+else
+# NOTE: keep extN before obdclass, mds, and obdfilter.  Keep obdclass as early
+# as possible, to have the best chance at stopping with "wrong kernel version"
+# instead of some related build failure.
+SUBDIRS = $(DIRS24) obdclass mds utils ptlrpc ldlm lib obdfilter mdc osc ost
+SUBDIRS+= llite obdecho lov cobd tests doc scripts conf
+endif
+
+DIST_SUBDIRS = $(SUBDIRS) liblustre
+EXTRA_DIST = BUGS FDL Rules include archdep.m4 kernel_patches
 
 # We get the version from the spec file.
 CONFIGURE_DEPENDENCIES = scripts/lustre.spec.in
@@ -21,5 +35,4 @@ dist-hook:
 include $(top_srcdir)/Rules
 
 rpms: dist Makefile
-       rpm -ta $(distdir).tar.gz
-
+       rpmbuild -ta $(distdir).tar.gz