file jbd-2.4.19-pre1-jcberr.patch was initially added on branch b_devel.

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

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index b84af44..425bed2 100644 (file)
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -4,15 +4,35 @@
 # See the file COPYING in this distribution
 
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = rpc llight lib ldlm obdecho mdc osc mds ost utils tests filterobd
-SUBDIRS+= class ext2obd obdfs obdtrace demos doc scripts extN
-#SUBDIRS+= oraid1 rpctarget inofs rpcclient tests snap
-EXTRA_DIST = BUGS FDL Rules include patches
+
+if LINUX25
+DIRS24 = 
+else
+DIRS24 = ptlbd
+endif
+
+if LIBLUSTRE
+SUBDIRS = portals obdclass lov ptlrpc obdecho ldlm osc utils mdc #liblustre
+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 = portals obdclass $(DIRS24) mds utils ldlm obdfilter mdc osc ost
+SUBDIRS+= llite obdecho lov cobd tests doc scripts conf ptlrpc
+endif
+
+DIST_SUBDIRS = $(SUBDIRS) liblustre
+EXTRA_DIST = BUGS FDL Rules include 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
+