X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=autoMakefile.am;h=01c35a550f7644893489abc611631391e14d46b0;hb=342c14842fa996181e5d5764701585b1b2f6d6cb;hp=d45897a5d802cf54360b200fa7c01a2b91a1cbb2;hpb=bb816c498612de8358cfd8008921ab9efac636b7;p=fs%2Flustre-release.git

diff --git a/autoMakefile.am b/autoMakefile.am
index d45897a..01c35a5 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
@@ -99,6 +104,7 @@ rpms: @PACKAGE_TARNAME@.spec dist Makefile
 	for arg in $(ac_configure_args); do \
 		case $$arg in \
 			--with-release=* ) ;; \
+			--with-kmp-moddir=* ) ;; \
 			--enable-tests | --disable-tests ) ;; \
 			--with-linux=* | --with-linux-obj=* ) ;; \
 			* ) CONFIGURE_ARGS="$$CONFIGURE_ARGS '$$arg'" ;; \
@@ -111,6 +117,9 @@ rpms: @PACKAGE_TARNAME@.spec dist Makefile
 			RPMARGS="$$RPMARGS --define \"kobjdir @LINUX_OBJ@\""; \
 		fi; \
 	fi; \
+	if [ -n "@KMP_MODDIR@" ]; then \
+		RPMARGS="$$RPMARGS --define \"kmoddir @KMP_MODDIR@\""; \
+	fi; \
 	if [ -n "@CROSS_PATH@" ]; then \
 		if [[ "X$(BUILD_SERVER)" = Xtrue ]]; then \
 			echo -e "\n" \
@@ -252,8 +261,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 \