merge b_devel into HEAD. Includes:

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

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index 718468b..7ad7358 100644 (file)
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -4,14 +4,35 @@
 # See the file COPYING in this distribution
 
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = ptlrpc llite lib ldlm obdecho mdc osc mds ost utils tests obdfilter
-SUBDIRS+= obdclass obdext2 obdfs demos doc scripts extN
-EXTRA_DIST = BUGS FDL Rules include patches
+
+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: scripts/lustre.spec.in
+CONFIGURE_DEPENDENCIES = scripts/lustre.spec.in
 
 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