LU-1267 lfsck: enhance RPCs (3) for MDT-OST consistency

[fs/lustre-release.git] / autoMakefile.am

diff --git a/autoMakefile.am b/autoMakefile.am
index ae9f30a..e6d496b 100644 (file)
--- 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)' \
@@ -129,9 +134,7 @@ rpms: @PACKAGE_TARNAME@.spec dist Makefile
                RPMARGS="$$RPMARGS --define \"_mandir %{_prefix}/share/man\""; \
                RPMARGS="$$RPMARGS --define \"_sysconfdir %{cross_path}/etc\""; \
                RPMARGS="$$RPMARGS --define \"make_args @CROSS_VARS@\""; \
-               if [ "@CC_TARGET_ARCH@" = "k1om-mpss-linux" ]; then \
-                       RPMARGS="$$RPMARGS --define \"cross_requires mpss-bootimage\""; \
-               else \
+               if [ "@CC_TARGET_ARCH@" = "x86_64-k1om-linux" ]; then \
                        RPMARGS="$$RPMARGS --define \"cross_requires intel-mic-gpl\""; \
                fi; \
        fi; \