X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=e94ce3d5b8e5c8c8f63e683ea23f2f90b69bb88e;hp=51658ae59b894eb5fc11cd804845fa6354660d68;hb=f843facff59226d3788d855d1d6948523ab8d944;hpb=cefa8cda2ba2d288ccaa4ec077a6c627592503ea

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 51658ae..e94ce3d 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -15,19 +15,17 @@
 #
 # 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.
+# http://www.gnu.org/licenses/gpl-2.0.html
 #
 # GPL HEADER END
 #
 
 #
-# 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, 2014, Intel Corporation.
+#
 
 #
 # This file is part of Lustre, http://www.lustre.org/
@@ -37,16 +35,13 @@
 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
-
-SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd
-
-CLIENT_SUBDIRS := mdc lmv llite lclient
+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)
 
@@ -58,35 +53,6 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
-SUBDIRS += $(QUOTA_SUBDIRS)
-
-# 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
-
-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/lustre/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