file llog_lvfs.c was initially added on branch b_llpmd.

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

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index ffaf6c4..425bed2 100644 (file)
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -5,13 +5,24 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-
-# NOTE: keep extN before mds
-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
+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_DEPENDENCIES = scripts/lustre.spec.in
@@ -23,5 +34,5 @@ dist-hook:
 include $(top_srcdir)/Rules
 
 rpms: dist Makefile
-       rpm -ta $(distdir).tar.gz
+       rpmbuild -ta $(distdir).tar.gz