X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=31b6109d16f8a0547cb49720cf937533c72c9afc;hp=55aa1b6b75242695eee166468ff25ab568ef54ba;hb=7e5be18a3ac2f5138627d7a93670fc88a06cafb5;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 55aa1b6..31b6109 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -25,9 +25,11 @@
 #
 
 #
-# Copyright  2008 Sun Microsystems, Inc. All rights reserved
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2011, Whamcloud, Inc.
+#
 
 #
 # This file is part of Lustre, http://www.lustre.org/
@@ -38,13 +40,11 @@ AUTOMAKE_OPTIONS = foreign
 
 # also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
 ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
-	mgc fid fld doc utils tests scripts autoconf contrib
-
-SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd
+	mgc fid fld doc utils tests scripts autoconf contrib conf
 
-CLIENT_SUBDIRS := mdc lmv llite
+SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd ofd osd-zfs osd-ldiskfs quota
 
-QUOTA_SUBDIRS := quota
+CLIENT_SUBDIRS := mdc lmv llite lclient
 
 LIBLUSTRE_SUBDIRS := liblustre
 
@@ -58,10 +58,6 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
-if QUOTA
-SUBDIRS += $(QUOTA_SUBDIRS)
-endif
-
 # this needs to be after the client subdirs
 if LIBLUSTRE
 if !CLIENT
@@ -71,9 +67,9 @@ SUBDIRS += $(LIBLUSTRE_SUBDIRS)
 endif
 
 DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)	\
-	$(LIBLUSTRE_SUBDIRS) $(QUOTA_SUBDIRS)
+	$(LIBLUSTRE_SUBDIRS)
 
-EXTRA_DIST = BUGS FDL kernel_patches
+EXTRA_DIST = BUGS FDL kernel_patches BUILDING
 
 lvfs-sources:
 	$(MAKE) sources -C lvfs