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 f16f126..425bed2 100644 (file)
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -8,21 +8,21 @@ AUTOMAKE_OPTIONS = foreign
 if LINUX25
 DIRS24 = 
 else
-DIRS24 = extN ptlbd
+DIRS24 = ptlbd
 endif
 
 if LIBLUSTRE
-SUBDIRS = lov obdclass ptlrpc obdecho ldlm osc liblustre utils
+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 = $(DIRS24) obdclass mds utils ptlrpc ldlm lib obdfilter mdc osc ost
-SUBDIRS+= llite obdecho lov cobd tests doc scripts conf
+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)
-EXTRA_DIST = BUGS FDL Rules include archdep.m4 kernel_patches
+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
@@ -35,3 +35,4 @@ include $(top_srcdir)/Rules
 
 rpms: dist Makefile
        rpmbuild -ta $(distdir).tar.gz
+