X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=13d576c981cdf3e1fb6465f08a1b585e953fe592;hb=56f88dd6b628210ed95a3cdf29b2a8d3ff6970f4;hp=29ba3f7ae2e986c8f0dc89a71bc15a35970c330a;hpb=65d9ef789300c9b0c0fc628d8ee80eca9dd2c128;p=fs%2Flustre-release.git

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 29ba3f7..13d576c 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -1,17 +1,51 @@
-# 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  2008 Sun Microsystems, Inc. All rights reserved
+# Use is subject to license terms.
+#
+
+#
+# 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 \
-	doc utils tests conf scripts autoconf
+	mgc doc utils tests scripts autoconf contrib
 
-SERVER_SUBDIRS := ldiskfs obdfilter ost mds
+SERVER_SUBDIRS := obdfilter ost mds mgs
 
 CLIENT_SUBDIRS := mdc llite
 
+QUOTA_SUBDIRS := quota
+
 LIBLUSTRE_SUBDIRS := liblustre
 
 SUBDIRS := $(ALWAYS_SUBDIRS)
@@ -24,6 +58,8 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
+SUBDIRS += $(QUOTA_SUBDIRS)
+
 # this needs to be after the client subdirs
 if LIBLUSTRE
 if !CLIENT
@@ -32,44 +68,25 @@ endif
 SUBDIRS += $(LIBLUSTRE_SUBDIRS)
 endif
 
-DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)	\
+	$(LIBLUSTRE_SUBDIRS) $(QUOTA_SUBDIRS)
 
 EXTRA_DIST = BUGS FDL kernel_patches
 
-if LDISKFS
-LDISKFS = ldiskfs-sources
-ldiskfs-sources:
-	$(MAKE) sources -C ldiskfs
-endif
-
 lvfs-sources:
 	$(MAKE) sources -C lvfs
+obdclass-sources:
+	$(MAKE) sources -C obdclass
 
-sources: $(LDISKFS) lvfs-sources lustre_build_version
+sources: $(LDISKFS) lvfs-sources obdclass-sources lustre_build_version
 
 all-recursive: lustre_build_version
 
+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
 	echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
-	cmp -s $(top_builddir)/lustre/include/linux/lustre_build_version.h tmpver \
-                2> /dev/null &&                                            \
-                $(RM) tmpver ||                                            \
-                mv tmpver $(top_builddir)/lustre/include/linux/lustre_build_version.h
-
-CSTK=/tmp/checkstack
-CSTKO=/tmp/checkstack.orig
-
-checkstack:
-	[ -f ${CSTK} -a ! -s ${CSTKO} ] && mv ${CSTK} ${CSTKO} || true
-	for i in ${SUBDIRS} portals/knals/*; do				     \
-		MOD=$$i/`basename $$i`.o;				     \
-		[ -f $$MOD ] && objdump -d $$MOD | perl tests/checkstack.pl; \
-	done | sort -nr > ${CSTK}
-	[ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
-
-checkstack-update:
-	[ -f ${CSTK} ] && mv ${CSTK} ${CSTKO}
-
-checkstack-clean:
-	rm -f ${CSTK} ${CSTKO}
+	cmp -s $(BUILD_VER_H) tmpver > tmpdiff 2> /dev/null &&		\
+                $(RM) tmpver tmpdiff ||					\
+		mv -f tmpver $(BUILD_VER_H)