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-3952 nfs: don't panic NFS server if MDS fails to find FID
[fs/lustre-release.git]
/
lustre
/
autoMakefile.am
diff --git
a/lustre/autoMakefile.am
b/lustre/autoMakefile.am
index
7559ef2
..
039bcc6
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) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
-# Copyright (c) 2011,
Whamcloud, Inc
.
+# Copyright (c) 2011,
2012, Intel Corporation
.
#
#
#
#
@@
-39,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
+SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
+ quota osp lod target lfsck
-CLIENT_SUBDIRS
:= mdc lmv llite lclient
+CLIENT_SUBDIRS
= mdc lmv llite lclient lov osc
-QUOTA_SUBDIRS := quota
-
-LIBLUSTRE_SUBDIRS := liblustre
+LIBLUSTRE_SUBDIRS = liblustre
SUBDIRS := $(ALWAYS_SUBDIRS)
SUBDIRS := $(ALWAYS_SUBDIRS)
@@
-60,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
@@
-71,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)
+ $(LIBLUSTRE_SUBDIRS)
EXTRA_DIST = BUGS FDL kernel_patches BUILDING
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
+sources: $(LDISKFS) lustre_build_version
all-recursive: lustre_build_version
all-recursive: lustre_build_version