X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FMakefile.am;h=7ad73580b562e1b173cd962b2c60a1281dc0ef1f;hb=a4346f1ee87f221d8541ad31b2efb3bba41a4df4;hp=6e9281dbeb58a8812c4e37b583b3b4b17919e5ea;hpb=25d101b814876bb26770def630a9ec364064056e;p=fs%2Flustre-release.git

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index 6e9281d..7ad7358 100644
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -6,17 +6,24 @@
 AUTOMAKE_OPTIONS = foreign
 
 if LINUX25
-DIRS24 = mds
+DIRS24 = 
 else
-DIRS24 = extN mds
+DIRS24 = extN ptlbd
 endif
 
-# NOTE: keep extN before mds and obdfilter
-SUBDIRS = $(DIRS24) obdclass utils ptlrpc ldlm lib obdfilter mdc osc ost llite 
-SUBDIRS+= obdecho lov tests doc scripts 
+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)
-EXTRA_DIST = BUGS FDL Rules include archdep.m4
+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
@@ -28,4 +35,4 @@ dist-hook:
 include $(top_srcdir)/Rules
 
 rpms: dist Makefile
-	rpm -ta $(distdir).tar.gz
+	rpmbuild -ta $(distdir).tar.gz