X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=e6d496bd49a1a7df688415880946a9f442d55205;hp=768deeb4b5daf67eaad5654ba66f84bf0c453285;hb=8466731d0834e9d33d4093681d5aa7e4e4368fed;hpb=06ba412f4ae34dd3d672efa2f5e9a752e3799ece

diff --git a/autoMakefile.am b/autoMakefile.am
index 768deeb..e6d496b 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -61,18 +61,23 @@ 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='$(EXTRA_LNET_INCLUDE) -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)' \
+	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)' \
 	$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
 	include/config/MARKER $@
 endif # LINUX
@@ -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; \
@@ -256,8 +259,8 @@ checkstack-clean:
 	rm -f ${CSTK} ${CSTKO}
 
 module-dist-hook:
-	if [ -d CVS -o -d .git ]; then \
-		perl lustre/scripts/make_META.pl > $(distdir)/META; \
+	if [ -d .git ]; then \
+		perl lustre/scripts/version_tag.pl --make_META > $(distdir)/META; \
 	elif [ -f META ]; then \
 		cp META $(distdir)/META; \
 	else \