X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=664a9e21ebdca2af5380ce5628b4d77235de995b;hb=66ca2bc59135b00cd20a4e5095a23cf54cdfa2eb;hp=2526d2786daf9d977709c2514bdb5590ac33c200;hpb=5065210e4d04fb5f67626e7f3c10e208556cdf8b;p=fs%2Flustre-release.git

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 2526d27..664a9e21 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -28,7 +28,7 @@
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright (c) 2011, Whamcloud, Inc.
+# Copyright (c) 2011, 2014, Intel Corporation.
 #
 
 #
@@ -39,14 +39,13 @@
 AUTOMAKE_OPTIONS = foreign
 
 # also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
-ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
+ALWAYS_SUBDIRS = include obdclass ldlm ptlrpc obdecho \
 	mgc fid fld doc utils tests scripts autoconf contrib conf
 
-SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd ofd osd-ldiskfs quota
+SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
+	quota osp lod target lfsck
 
-CLIENT_SUBDIRS := mdc lmv llite lclient
-
-LIBLUSTRE_SUBDIRS := liblustre
+CLIENT_SUBDIRS = mdc lmv llite lov osc
 
 SUBDIRS := $(ALWAYS_SUBDIRS)
 
@@ -58,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