From 9e7182c7d63a7ce18fff8f297672768982d8a8aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 7 Jun 2016 22:43:16 +0200 Subject: [PATCH] Fix make dist It got broken when the versions.py file was moved around in d110f526706b7c4880ca916e2dfbab93138871cd. Also add the new locations to EXTRA_DIST so they get distributed too. --- acceptance-tests/Makefile.am | 2 +- llvm/.gitignore | 2 ++ llvm/Makefile.am | 2 ++ scripts/Makefile.am | 4 +++- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 llvm/.gitignore diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am index 1b1612f9fb1..522cb36c9ea 100644 --- a/acceptance-tests/Makefile.am +++ b/acceptance-tests/Makefile.am @@ -4,7 +4,7 @@ CORECLR_PATH=$(ACCEPTANCE_TESTS_PATH)/coreclr MSTESTSUITE_PATH=$(ACCEPTANCE_TESTS_PATH)/ms-test-suite CLEANFILES = *.dll *.exe *.mdb -EXTRA_DIST=README.md SUBMODULES.json versions.mk versions.py roslyn.mk coreclr.mk ms-test-suite.mk +EXTRA_DIST=README.md SUBMODULES.json versions.mk roslyn.mk coreclr.mk ms-test-suite.mk CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE) diff --git a/llvm/.gitignore b/llvm/.gitignore new file mode 100644 index 00000000000..b336cc7cec9 --- /dev/null +++ b/llvm/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/llvm/Makefile.am b/llvm/Makefile.am index e380f2bebf7..e8004bf5cb9 100644 --- a/llvm/Makefile.am +++ b/llvm/Makefile.am @@ -25,3 +25,5 @@ bump-current-llvm: __bump-current-version-llvm clean-local: $(RM) -r $(LLVM_PATH) + +EXTRA_DIST=SUBMODULES.json diff --git a/scripts/Makefile.am b/scripts/Makefile.am index be4d6b164a0..fa2d8378bbf 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -160,7 +160,9 @@ EXTRA_DIST = \ mono-heapviz \ $(MDOC_COMPAT) \ get-cygwin-deps.sh \ - mono-configuration-crypto.in + mono-configuration-crypto.in \ + submodules/versions.mk \ + submodules/versions.py mono_interp = mono -- 2.25.1