X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=664a9e21ebdca2af5380ce5628b4d77235de995b;hp=f8fa8344a791fe131136176c12f09c4dd68453bb;hb=b046468f58a1f40e85cb59ed9abf75fd2fd5ea5a;hpb=ffc62b1d8a51f53d51fc4e77375e0400accfdde5

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index f8fa834..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, 2012, Intel Corporation.
+# Copyright (c) 2011, 2014, Intel Corporation.
 #
 
 #
@@ -43,11 +43,9 @@ 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 nodemap
+	quota osp lod target lfsck
 
-CLIENT_SUBDIRS = mdc lmv llite lclient lov osc
-
-LIBLUSTRE_SUBDIRS = liblustre
+CLIENT_SUBDIRS = mdc lmv llite lov osc
 
 SUBDIRS := $(ALWAYS_SUBDIRS)
 
@@ -59,16 +57,7 @@ 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)
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)
 
 EXTRA_DIST = BUGS kernel_patches BUILDING