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

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index 266acf6..7ad7358 100644
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -5,14 +5,28 @@
 
 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 demos 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: scripts/lustre.spec.in
+CONFIGURE_DEPENDENCIES = scripts/lustre.spec.in
 
 dist-hook:
 	find $(distdir) -name .deps | xargs rm -rf
@@ -21,5 +35,4 @@ dist-hook:
 include $(top_srcdir)/Rules
 
 rpms: dist Makefile
-	rpm -ta $(distdir).tar.gz
-
+	rpmbuild -ta $(distdir).tar.gz