LU-1222 ldlm: Fix the race in AST sender vs multiple arriving RPCs

[fs/lustre-release.git] / lustre / autoMakefile.am

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 169861b..7559ef2 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -14,8 +14,8 @@
 # in the LICENSE file that accompanied this code).
 #
 # You should have received a copy of the GNU General Public License
-# version 2 along with this program; If not, see [sun.com URL with a
-# copy of GPLv2].
+# version 2 along with this program; If not, see
+# http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
 #
 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 # CA 95054 USA or visit www.sun.com if you need additional information or
@@ -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,11 +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
+       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
+CLIENT_SUBDIRS := mdc lmv llite lclient
 
 QUOTA_SUBDIRS := quota
 
@@ -58,9 +60,7 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
-if QUOTA
 SUBDIRS += $(QUOTA_SUBDIRS)
-endif
 
 # this needs to be after the client subdirs
 if LIBLUSTRE
@@ -73,7 +73,7 @@ endif
 DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)  \
        $(LIBLUSTRE_SUBDIRS) $(QUOTA_SUBDIRS)
 
-EXTRA_DIST = BUGS FDL kernel_patches
+EXTRA_DIST = BUGS FDL kernel_patches BUILDING
 
 lvfs-sources:
        $(MAKE) sources -C lvfs