X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=e94ce3d5b8e5c8c8f63e683ea23f2f90b69bb88e;hp=f0531e835caddc17b44a8805445baa1c02fbf1e7;hb=72617588ac8cb2e3e5a7b8e5ebc201cab524d938;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index f0531e8..e94ce3d 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -1,21 +1,47 @@
-# 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
+#
 
-AUTOMAKE_OPTIONS = foreign
+#
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright (c) 2011, 2014, Intel Corporation.
+#
 
-# 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
+#
+# This file is part of Lustre, http://www.lustre.org/
+# Lustre is a trademark of Sun Microsystems, Inc.
+#
 
-SERVER_SUBDIRS := ldiskfs obdfilter ost mds mgs
+AUTOMAKE_OPTIONS = foreign
 
-CLIENT_SUBDIRS := mdc llite
+# 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
 
-QUOTA_SUBDIRS := quota
+SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
+	quota osp lod target lfsck
 
-LIBLUSTRE_SUBDIRS := liblustre
+CLIENT_SUBDIRS = mdc lmv llite lov osc
 
 SUBDIRS := $(ALWAYS_SUBDIRS)
 
@@ -27,43 +53,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
-SUBDIRS += $(CLIENT_SUBDIRS)
-endif
-SUBDIRS += $(LIBLUSTRE_SUBDIRS)
-endif
-
-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 obdclass-sources lustre_build_version
-
-all-recursive: lustre_build_version
-
-BUILD_VER_H=$(top_builddir)/lustre/include/linux/lustre_build_version.h
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)
 
-lustre_build_version:
-	perl $(top_builddir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
-	echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
-	cmp -s $(BUILD_VER_H) tmpver > tmpdiff 2> /dev/null &&		\
-                $(RM) tmpver tmpdiff ||					\
-		mv -f tmpver $(BUILD_VER_H)
+EXTRA_DIST = BUGS kernel_patches BUILDING