X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=efe98f9afd4e0e5fa58f2bdee1a3335c7f976a82;hb=593b6ab6d21976d37004621b86f37715df697e9e;hp=56bb608151fa44c77c715a04618d6f559e29f0be;hpb=2f41b688058532248e69ff0194c27616f4dfb6d5;p=fs%2Flustre-release.git

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 56bb608..efe98f9 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -39,16 +39,14 @@
 AUTOMAKE_OPTIONS = foreign
 
 # also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
-ALWAYS_SUBDIRS = include lvfs obdclass ldlm ptlrpc obdecho \
+ALWAYS_SUBDIRS = include obdclass ldlm ptlrpc obdecho \
 	mgc fid fld doc utils tests scripts autoconf contrib conf
 
 SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
-	quota osp lod target lfsck
+	quota osp lod target lfsck nodemap
 
 CLIENT_SUBDIRS = mdc lmv llite lclient lov osc
 
-LIBLUSTRE_SUBDIRS = liblustre
-
 SUBDIRS := $(ALWAYS_SUBDIRS)
 
 if SERVER
@@ -59,25 +57,11 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
-# this needs to be after the client subdirs
-if LIBLUSTRE
-if !CLIENT
-SUBDIRS += $(CLIENT_SUBDIRS)
-endif
-SUBDIRS += $(LIBLUSTRE_SUBDIRS)
-endif
-
-DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)	\
-	$(LIBLUSTRE_SUBDIRS)
-
-EXTRA_DIST = BUGS FDL kernel_patches BUILDING
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)
 
-lvfs-sources:
-	$(MAKE) sources -C lvfs
-obdclass-sources:
-	$(MAKE) sources -C obdclass
+EXTRA_DIST = BUGS kernel_patches BUILDING
 
-sources: $(LDISKFS) lvfs-sources obdclass-sources lustre_build_version
+sources: lustre_build_version
 
 all-recursive: lustre_build_version