X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=31b6109d16f8a0547cb49720cf937533c72c9afc;hp=b2097eaf3baacad9b0c2de56770e05988a863395;hb=091c8a93c184b2ff75a71ba665dbfcf38e435a6f;hpb=85e4fee3be74cd0e6f2f2e5593711abd6ec4eb23

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index b2097ea..31b6109 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -1,19 +1,50 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
 #
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
+# GPL HEADER START
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 only,
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License version 2 for more details (a copy is included
+# 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
+# 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
+# have any questions.
+#
+# GPL HEADER END
+#
+
+#
+# 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/
+# Lustre is a trademark of Sun Microsystems, Inc.
+#
 
 AUTOMAKE_OPTIONS = foreign
 
 # also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
 ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
-	mgc doc utils tests scripts autoconf contrib
-
-SERVER_SUBDIRS := ldiskfs ldiskfs2 obdfilter ost mds mgs
+	mgc fid fld doc utils tests scripts autoconf contrib conf
 
-CLIENT_SUBDIRS := mdc 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
 
@@ -27,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
@@ -40,17 +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
-
-if LDISKFS
-LDISKFS = ldiskfs-sources ldiskfs2-sources
-ldiskfs-sources:
-	$(MAKE) sources -C ldiskfs
-ldiskfs2-sources:
-	$(MAKE) sources -C ldiskfs2
-endif
+EXTRA_DIST = BUGS FDL kernel_patches BUILDING
 
 lvfs-sources:
 	$(MAKE) sources -C lvfs
@@ -61,7 +80,7 @@ sources: $(LDISKFS) lvfs-sources obdclass-sources lustre_build_version
 
 all-recursive: lustre_build_version
 
-BUILD_VER_H=$(top_builddir)/lustre/include/linux/lustre_build_version.h
+BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
 
 lustre_build_version:
 	perl $(top_builddir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver