X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=autoMakefile.am;h=0943370e94be97e8a17bd52df28ff41b75b2ac43;hb=9806eb0efdba6d815808f53ada4423850f4493f7;hp=64d4c4c47cc0bf9125bd4aadb1afe1207dd7be3b;hpb=23434f3408063164c863a7d56c661c41fa2e779f;p=fs%2Flustre-release.git

diff --git a/autoMakefile.am b/autoMakefile.am
index 64d4c4c..0943370 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -75,7 +75,7 @@ if LINUX
 all-am: modules
 
 modules: undef.h ldiskfs-sources lustre-sources
-	$(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ)	     \
+	$(MAKE) CC="$(CC)" -C $(LINUX_OBJ) \
 	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
 	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(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 \
@@ -93,18 +93,16 @@ dist-hook: undef.h
 			-name .svn -o \
 			-name .git -o \
 			-name .#* -exec rm -rf {} \;
-	$(MAKE) $(AM_MAKEFLAGS) \
-		top_distdir="$(top_distdir)" distdir="$(distdir)" \
-		module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec	\
 	build/Makefile 			\
 	build/Rules.in			\
-	build/gen_filelist.sh		\
 	config.h.in			\
 	undef.h				\
 	lustre-dkms_pre-build.sh	\
-	lustre-dkms_post-build.sh
+	lustre-dkms_post-build.sh	\
+	LUSTRE-VERSION-GEN		\
+	LUSTRE-VERSION-FILE
 
 rpm-local:
 	@(if test -z "$(RPMBUILD)"; then \
@@ -253,16 +251,3 @@ checkstack-update:
 
 checkstack-clean:
 	rm -f ${CSTK} ${CSTKO}
-
-module-dist-hook:
-	@if [ -d .git ]; then \
-		perl lustre/scripts/version_tag.pl \
-			--make_META > $(distdir)/META; \
-	elif [ -f META ]; then \
-		cp META $(distdir)/META; \
-	else \
-		echo -e "\n" \
-		"*** I have no idea how to create a META file in $(distdir).\n"\
-		"*** Please file a bug at https://jira.hpdd.intel.com/\n"; \
-		exit 1; \
-	fi