Whamcloud - gitweb
LU-4314 build: no dependency from ldiskfs sources 04/8404/5
authorDmitry Eremin <dmitry.eremin@intel.com>
Tue, 26 Nov 2013 20:18:53 +0000 (00:18 +0400)
committerOleg Drokin <oleg.drokin@intel.com>
Mon, 13 Jan 2014 05:50:13 +0000 (05:50 +0000)
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>

index ae9f30a..01c35a5 100644 (file)
@@ -61,15 +61,20 @@ doxygen-%: build/doxyfile.%
        doxygen $<
-sources: all-sources
+.PHONY: ldiskfs-sources lustre-sources
-all-sources: module-symvers
+       $(MAKE) sources -C @LDISKFS_SUBDIR@ || exit $$?
        $(MAKE) sources -C lustre || exit $$?
 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)' \
index ede719e..c9e8f1d 100644 (file)
-sources: $(LDISKFS) lustre_build_version
+sources: lustre_build_version
 all-recursive: lustre_build_version