X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=f31442a04cc409bf89d859d72e8e578d66c73a5b;hb=b2287531b63ac56692746a67ea17f576a6d2ab81;hp=684d0e773465db496fe048875f976884eed682cc;hpb=e992a95314f9d6721144d5521ebe795a72bb140a;p=fs%2Flustre-release.git

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 684d0e7..f31442a 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -28,6 +28,8 @@
 # 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/
@@ -37,16 +39,15 @@
 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-ldiskfs
+ALWAYS_SUBDIRS = include lvfs obdclass ldlm ptlrpc osc lov obdecho \
+	mgc fid fld doc utils tests scripts autoconf contrib conf
 
-CLIENT_SUBDIRS := mdc lmv llite lclient
+SERVER_SUBDIRS = obdfilter ost mds mgs mdt cmm mdd ofd osd-zfs osd-ldiskfs \
+	quota osp lod
 
-QUOTA_SUBDIRS := quota
+CLIENT_SUBDIRS = mdc lmv llite lclient
 
-LIBLUSTRE_SUBDIRS := liblustre
+LIBLUSTRE_SUBDIRS = liblustre
 
 SUBDIRS := $(ALWAYS_SUBDIRS)
 
@@ -58,8 +59,6 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
-SUBDIRS += $(QUOTA_SUBDIRS)
-
 # this needs to be after the client subdirs
 if LIBLUSTRE
 if !CLIENT
@@ -69,9 +68,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