LU-7117 osp: set ptlrpc_request::rq_allow_replay properly

[fs/lustre-release.git] / lustre / autoMakefile.am

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index f542f3e..a25fe05 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -28,7 +28,7 @@
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright (c) 2011, Whamcloud, Inc.
+# Copyright (c) 2011, 2014, Intel Corporation.
 #
 
 #
@@ -39,14 +39,13 @@
 AUTOMAKE_OPTIONS = foreign
 
 # also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
-ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
+ALWAYS_SUBDIRS = include obdclass ldlm ptlrpc obdecho \
        mgc fid fld doc utils tests scripts autoconf contrib conf
 
-SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd-ldiskfs quota
+SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
+       quota osp lod target lfsck
 
-CLIENT_SUBDIRS := mdc lmv llite lclient
-
-LIBLUSTRE_SUBDIRS := liblustre
+CLIENT_SUBDIRS = mdc lmv llite lov osc
 
 SUBDIRS := $(ALWAYS_SUBDIRS)
 
@@ -58,33 +57,6 @@ if CLIENT
 SUBDIRS += $(CLIENT_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)
-
-EXTRA_DIST = BUGS FDL kernel_patches BUILDING
-
-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