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-7261 ldiskfs: fix large_xattr overwrite
[fs/lustre-release.git]
/
lustre
/
autoMakefile.am
diff --git
a/lustre/autoMakefile.am
b/lustre/autoMakefile.am
index
039bcc6
..
664a9e2
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, 201
2
, Intel Corporation.
+# Copyright (c) 2011, 201
4
, Intel Corporation.
#
#
#
#
@@
-45,9
+45,7
@@
ALWAYS_SUBDIRS = include obdclass ldlm ptlrpc obdecho \
SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
quota osp lod target lfsck
SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
quota osp lod target lfsck
-CLIENT_SUBDIRS = mdc lmv llite lclient lov osc
-
-LIBLUSTRE_SUBDIRS = liblustre
+CLIENT_SUBDIRS = mdc lmv llite lov osc
SUBDIRS := $(ALWAYS_SUBDIRS)
SUBDIRS := $(ALWAYS_SUBDIRS)
@@
-59,20
+57,11
@@
if CLIENT
SUBDIRS += $(CLIENT_SUBDIRS)
endif
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)
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)
-EXTRA_DIST = BUGS
FDL
kernel_patches BUILDING
+EXTRA_DIST = BUGS kernel_patches BUILDING
-sources:
$(LDISKFS)
lustre_build_version
+sources: lustre_build_version
all-recursive: lustre_build_version
all-recursive: lustre_build_version