X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=16ea0857827ccd919bed3a29c4f68f9a60a234e3;hb=c0468e08ce5864884265a542606f6253cce19bad;hp=3ad402491e953f737cc1a26fd957bf8423c1802d;hpb=fbf5870b9848929d352460f1f005b79c0b5ccc5a;p=fs%2Flustre-release.git

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 3ad4024..16ea085 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -25,7 +25,7 @@
 #
 
 #
-# 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.
 #
 
@@ -38,9 +38,9 @@ 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
+	mgc fid fld doc utils tests scripts autoconf contrib conf
 
-SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd
+SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd-ldiskfs
 
 CLIENT_SUBDIRS := mdc lmv llite lclient
 
@@ -58,9 +58,7 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
-if QUOTA
 SUBDIRS += $(QUOTA_SUBDIRS)
-endif
 
 # this needs to be after the client subdirs
 if LIBLUSTRE