From: Dmitry Eremin <dmitry.eremin@intel.com>
Date: Tue, 26 Nov 2013 20:18:53 +0000 (+0400)
Subject: LU-4314 build: no dependency from ldiskfs sources
X-Git-Tag: 2.5.55~58
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6e270587e4a49fa1cd35e26e3af438b6511393e5;p=fs%2Flustre-release.git

LU-4314 build: no dependency from ldiskfs sources

Fix absence dependency modules from ldiskfs sources. Otherwise the
build of modules begins early than actual sources prepared in ldiskfs
directory in case of parallel build (with -j <n> option).

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: I24d3630d9132235a2dc5433eb5b8d3379c04acaa
Reviewed-on: http://review.whamcloud.com/8404
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Christopher J. Morrone <chris.morrone.llnl@gmail.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/autoMakefile.am b/autoMakefile.am
index ae9f30a..01c35a5 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -61,15 +61,20 @@ doxygen-%: build/doxyfile.%
 	doxygen $<
 
 if MODULES
-sources: all-sources
+.PHONY: ldiskfs-sources lustre-sources
 
-all-sources: module-symvers
+ldiskfs-sources:
+if LDISKFS_ENABLED
+	$(MAKE) sources -C @LDISKFS_SUBDIR@ || exit $$?
+endif
+
+lustre-sources:
 	$(MAKE) sources -C lustre || exit $$?
 
 if LINUX
 all-am: modules
 
-modules: $(DEP) all-sources
+modules: ldiskfs-sources lustre-sources module-symvers
 	$(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ)	     \
 	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
 	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index ede719e..c9e8f1dd 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -72,7 +72,7 @@ DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)	\
 
 EXTRA_DIST = BUGS FDL kernel_patches BUILDING
 
-sources: $(LDISKFS) lustre_build_version
+sources: lustre_build_version
 
 all-recursive: lustre_build_version