Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-4429 llite: fix open lock matching in ll_md_blocking_ast()
[fs/lustre-release.git]
/
lustre
/
autoMakefile.am
diff --git
a/lustre/autoMakefile.am
b/lustre/autoMakefile.am
index
16ea085
..
ede719e
100644
(file)
--- a/
lustre/autoMakefile.am
+++ b/
lustre/autoMakefile.am
@@
-28,6
+28,8
@@
# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
+# Copyright (c) 2011, 2012, Intel Corporation.
+#
#
# This file is part of Lustre, http://www.lustre.org/
#
# This file is part of Lustre, http://www.lustre.org/
@@
-37,16
+39,15
@@
AUTOMAKE_OPTIONS = foreign
# also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
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
mgc fid fld doc utils tests scripts autoconf contrib conf
-SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd-ldiskfs
-
-CLIENT_SUBDIRS := mdc lmv llite lclient
+SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
+ quota osp lod target lfsck nodemap
-QUOTA_SUBDIRS := quota
+CLIENT_SUBDIRS = mdc lmv llite lclient lov osc
-LIBLUSTRE_SUBDIRS
:
= liblustre
+LIBLUSTRE_SUBDIRS = liblustre
SUBDIRS := $(ALWAYS_SUBDIRS)
SUBDIRS := $(ALWAYS_SUBDIRS)
@@
-58,8
+59,6
@@
if CLIENT
SUBDIRS += $(CLIENT_SUBDIRS)
endif
SUBDIRS += $(CLIENT_SUBDIRS)
endif
-SUBDIRS += $(QUOTA_SUBDIRS)
-
# this needs to be after the client subdirs
if LIBLUSTRE
if !CLIENT
# this needs to be after the client subdirs
if LIBLUSTRE
if !CLIENT
@@
-69,16
+68,11
@@
SUBDIRS += $(LIBLUSTRE_SUBDIRS)
endif
DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) \
endif
DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) \
- $(LIBLUSTRE_SUBDIRS) $(QUOTA_SUBDIRS)
-
-EXTRA_DIST = BUGS FDL kernel_patches
+ $(LIBLUSTRE_SUBDIRS)
-lvfs-sources:
- $(MAKE) sources -C lvfs
-obdclass-sources:
- $(MAKE) sources -C obdclass
+EXTRA_DIST = BUGS FDL kernel_patches BUILDING
-sources: $(LDISKFS) l
vfs-sources obdclass-sources l
ustre_build_version
+sources: $(LDISKFS) lustre_build_version
all-recursive: lustre_build_version
all-recursive: lustre_build_version