X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=e94ce3d5b8e5c8c8f63e683ea23f2f90b69bb88e;hp=9b829bfc1995987f70fca0d53b0ed3e17711c623;hb=917655fc2938b90a9c246dd2d58408c42aa1658d;hpb=bd1b99d7caa6ab2b7c771524af9178a3da69eeab

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 9b829bf..e94ce3d 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -1,70 +1,58 @@
-# 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.gnu.org/licenses/gpl-2.0.html
+#
+# GPL HEADER END
+#
+
+#
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright (c) 2011, 2014, Intel Corporation.
+#
+
+#
+# This file is part of Lustre, http://www.lustre.org/
+# Lustre is a trademark of Sun Microsystems, Inc.
+#
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = . include portals ldiskfs lvfs obdclass lov ldlm ptlrpc      \
-	obdecho osc mdc mds obdfilter ost llite cobd ptlbd snapfs smfs \
-	liblustre doc utils tests conf scripts
+# also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
+ALWAYS_SUBDIRS = include obdclass ldlm ptlrpc obdecho \
+	mgc fid fld doc utils tests tests/kernel scripts autoconf contrib conf
 
-EXTRA_DIST = BUGS FDL Rules.in kernel_patches kernel-tests/Makefile	\
-	README.kernel-source
+SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
+	quota osp lod target lfsck
 
-if MODULES
-all-am: modules
+CLIENT_SUBDIRS = mdc lmv llite lov osc
 
-if !LINUX25
-DEP = dep
-dep: .depend
+SUBDIRS := $(ALWAYS_SUBDIRS)
 
-.depend:
-	$(MAKE) $(ARCH_UM) -C $(LINUX) -f $(PWD)/kernel-tests/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) -o scripts -o include/config/MARKER _sfdep_$(PWD) _FASTDEP_ALL_SUB_DIRS="$(PWD)"
+if SERVER
+SUBDIRS += $(SERVER_SUBDIRS)
 endif
 
-if LDISKFS
-LDISKFS = ldiskfs-sources
-ldiskfs-sources:
-	$(MAKE) sources -C ldiskfs
+if CLIENT
+SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
-lvfs-sources:
-	$(MAKE) sources -C lvfs
-
-modules: lustre_build_version $(DEP) $(LDISKFS) lvfs-sources
-	$(MAKE) $(ARCH_UM) -C $(LINUX) -f $(PWD)/kernel-tests/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) SUBDIRS=$(PWD) -o tmp_include_depends -o scripts -o include/config/MARKER $@
-
-lustre_build_version:
-	perl $(top_builddir)/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
-	echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
-	cmp -s $(top_builddir)/include/linux/lustre_build_version.h tmpver \
-                2> /dev/null &&                                            \
-                $(RM) tmpver ||                                            \
-                mv tmpver $(top_builddir)/include/linux/lustre_build_version.h
-
-endif # MODULES
-
-dist-hook:
-	find $(distdir) -name .deps | xargs rm -rf
-	find $(distdir) -name CVS | xargs rm -rf
-
-rpms: dist Makefile
-	rpmbuild -ta $(distdir).tar.gz
-
-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}
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)
 
-checkstack-clean:
-	rm -f ${CSTK} ${CSTKO}
+EXTRA_DIST = BUGS kernel_patches BUILDING