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.

diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am
index 1b1612f9fb1713372babffcb76dc15a9b7f8f0e1..522cb36c9ea47999dfd6dbe7474f11567a1aa1b8 100644 (file)
--- 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 (file)
index 0000000..b336cc7
--- /dev/null
+++ b/llvm/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in

diff --git a/llvm/Makefile.am b/llvm/Makefile.am
index e380f2bebf75e245a0bb1d2c710f6146e4c21b1a..e8004bf5cb934c30915bc9888eb71ce12d2a7b82 100644 (file)
--- 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 be4d6b164a009018668e73beac1c186eb1666e03..fa2d8378bbf8dc85dcc279bf8c1a0cadf5e9790b 100644 (file)
--- 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