[Build] Move submodules to monodevelop/main/externals instead of monodevelop/externals

This will simplify make dist and building from tarballs as everything will
have the correct relative path.

17 files changed, 41 insertions, 24 deletions

diff --git a/.gitmodules b/.gitmodules
index b0f50c7670..059f9649f5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,18 @@
 [submodule "external/cecil"]
 	path = external/cecil
 	url = git://github.com/mono/cecil.git
+[submodule "main/external/cecil"]
+	path = main/external/cecil
+	url = git://github.com/mono/cecil.git
+[submodule "main/external/maccore"]
+	path = main/external/maccore
+	url = git://github.com/mono/maccore.git
+[submodule "main/external/mono-tools"]
+	path = main/external/mono-tools
+	url = git://github.com/mono/mono-tools.git
+[submodule "main/external/monomac"]
+	path = main/external/monomac
+	url = git://github.com/mono/monomac.git
+[submodule "main/external/ngit"]
+	path = main/external/ngit
+	url = git://github.com/mono/ngit.git
diff --git a/Makefile b/Makefile
index dc42db4542..d0f8d4048f 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,10 @@ distcheck: distcheck-recursive
 distclean: distclean-recursive
 	rm -rf config.make local-config
 
-dist: dist-recursive
+remove-stale-tarballs:
 	rm -rf tarballs
+
+dist: remove-stale-tarballs dist-recursive
 	mkdir -p tarballs
 	for t in $(SUBDIRS); do \
 		if test -a $$t/*.tar.gz; then \
diff --git a/external/cecil b/external/cecil
deleted file mode 160000
-Subproject 54e0a50464edbc254b39ea3c885ee91ada73070
diff --git a/external/maccore b/external/maccore
deleted file mode 160000
-Subproject 3c44e221169d2b81ccca864e601fbb3cf3c9ccd
diff --git a/external/monomac b/external/monomac
deleted file mode 160000
-Subproject 8bee179d96e3372d2d9d48e479893a51542c4f6
diff --git a/main/Main.sln b/main/Main.sln
index d605a331d2..6131668a2e 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -156,11 +156,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{F129
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "contrib\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharpen", "..\external\ngit\Sharpen\Sharpen.csproj", "{72944A6C-45FF-4EF8-B349-8C9CABF519D4}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharpen", "external\ngit\Sharpen\Sharpen.csproj", "{72944A6C-45FF-4EF8-B349-8C9CABF519D4}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSch", "..\external\ngit\NSch\NSch.csproj", "{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSch", "external\ngit\NSch\NSch.csproj", "{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGit", "..\external\ngit\NGit\NGit.csproj", "{E3BFF8B4-189C-496A-A817-7E8B31E22B91}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGit", "external\ngit\NGit\NGit.csproj", "{E3BFF8B4-189C-496A-A817-7E8B31E22B91}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugger.Soft", "contrib\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj", "{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}"

 EndProject

@@ -170,9 +170,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "c
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp", "contrib\ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{53DCA265-3C3C-42F9-B647-F72BA678122B}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "..\external\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "external\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Mdb", "..\external\cecil\symbols\mdb\Mono.Cecil.Mdb.csproj", "{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Mdb", "external\cecil\symbols\mdb\Mono.Cecil.Mdb.csproj", "{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}"

 EndProject

 Project("{9344bdbb-3e7f-41fc-a0dd-8665d75ee146}") = "po", "po\po.mdproj", "{AC7D119C-980B-4712-8811-5368C14412D7}"

 EndProject

diff --git a/main/Makefile.am b/main/Makefile.am
index d034f6b680..d514b6266b 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = ../external contrib src po man theme-icons build tests
+SUBDIRS = external contrib src po man theme-icons build tests
 
 #capture aclocal flags for autoreconf
 ACLOCAL_AMFLAGS=$(ACLOCAL_FLAGS)
@@ -149,7 +149,7 @@ app-dir: all
 
 # we can't use the variables that are conditionally defined
 EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) $(pixmap_DATA) \
-	monodevelop.xml $(pkgconfig_in_files) vcrevision
+	monodevelop.xml $(pkgconfig_in_files) vcrevision external/Makefile.in
 
 DISTCLEANFILES = monodevelop intltool-extract intltool-merge intltool-update \
 	$(pkgconfig_DATA) 
diff --git a/main/configure.in b/main/configure.in
index 7e78d345eb..6e0c7211da 100644
--- a/main/configure.in
+++ b/main/configure.in
@@ -271,6 +271,7 @@ contrib/NRefactory/Makefile
 contrib/ICSharpCode.NRefactory/Makefile
 contrib/ICSharpCode.NRefactory.CSharp/Makefile
 contrib/ICSharpCode.Decompiler/Makefile
+external/Makefile
 src/Makefile
 src/core/Makefile
 src/core/Mono.Texteditor/Makefile
diff --git a/external/Makefile b/main/external/Makefile.am
index 521bf41b3f..569d9c5578 100644
--- a/external/Makefile
+++ b/main/external/Makefile.am
@@ -1,5 +1,4 @@
-SUBDIRS=`ls .`
-TARBALL_PATH=../tarballs
+TARBALL_PATH=../../tarballs
 
 NGIT_SLN=ngit/ngit.sln
 NGIT=$(NGIT_SLN) /t:NGit
@@ -8,7 +7,7 @@ CECIL_SLN=cecil/Mono.Cecil.sln
 CECIL=/property:Configuration=net_4_0_Debug $(CECIL_SLN)
 CECIL_OUTPUT=cecil/bin/net_4_0_Debug
 
-OUTPUT=../main/build/bin
+OUTPUT=../build/bin
 
 all:
 	mkdir -p $(OUTPUT)
@@ -32,15 +31,15 @@ distdir: dist
 
 dist:
 	mkdir -p $(TARBALL_PATH)
-	@for dir in $(SUBDIRS); do \
+	@for dir in `ls .`; do \
 		if test -d $$dir; then \
 			echo Creating tarball for $$dir; \
-			cd $$dir && git archive --prefix=external/$$dir/ HEAD | bzip2 > ../$(TARBALL_PATH)/$$dir.tar.bz2 && cd ..; \
+			cd $$dir && git archive --prefix=monodevelop-@PACKAGE_VERSION@/external/$$dir/ HEAD | bzip2 > ../$(TARBALL_PATH)/$$dir-@PACKAGE_VERSION@.tar.bz2 && cd ..; \
 		fi \
 	done	
 
 dist-clean:
-	@for dir in $(SUBDIRS); do \
+	@for dir in `ls .`; do \
 		if test -d $$dir; then \
 			rm -f $(TARBALL_PATH)/$$dir.tar.bz2; \
 		fi \
diff --git a/main/external/cecil b/main/external/cecil
new file mode 160000
+Subproject e41dd1b4dc1d1c015b6c34ea24664b7eb3bece6
diff --git a/main/external/maccore b/main/external/maccore
new file mode 160000
+Subproject 0b71453a3f1ec29a237eae408358beb54450fde
diff --git a/external/mono-tools b/main/external/mono-tools
-Subproject 5a87f3762955838667a82b088b4dc69255c4cd0
+Subproject 5a87f3762955838667a82b088b4dc69255c4cd0
diff --git a/main/external/monomac b/main/external/monomac
new file mode 160000
+Subproject ae428c79e46e6c643f8952e4ae23503bc633aaa
diff --git a/external/ngit b/main/external/ngit
-Subproject 3806aa5a8cf71d24dcfc797d2125556f8298711
+Subproject 3806aa5a8cf71d24dcfc797d2125556f8298711
diff --git a/main/src/addins/MacPlatform/Makefile.am b/main/src/addins/MacPlatform/Makefile.am
index 5aa28aea95..1779fdc381 100644
--- a/main/src/addins/MacPlatform/Makefile.am
+++ b/main/src/addins/MacPlatform/Makefile.am
@@ -2,7 +2,7 @@
 ADDIN_BUILD = $(top_builddir)/build/AddIns
 ASSEMBLY = $(ADDIN_BUILD)/MacPlatform.dll
 
-MONOMAC_SRC = $(top_srcdir)/../external/monomac/src/MonoMac.dll
+MONOMAC_SRC = $(top_srcdir)/external/monomac/src/MonoMac.dll
 MONOMAC = $(ADDIN_BUILD)/MonoMac.dll
 
 DEPS =  \
@@ -12,7 +12,7 @@ DEPS =  \
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:../../../../external/monomac/src/MonoMac.dll \
+	-r:../../../external/monomac/src/MonoMac.dll \
 	-r:Mono.Posix \
 	-r:System \
 	-r:System.Core \
@@ -59,7 +59,7 @@ all:
 endif
 
 $(MONOMAC_SRC):
-	make -C $(top_srcdir)/../external/monomac/src
+	make -C $(top_srcdir)/external/monomac/src
 
 $(ASSEMBLY): $(MONOMAC_SRC) $(build_sources) $(build_resources) $(DEPS)
 	mkdir -p $(ADDIN_BUILD)
diff --git a/main/src/addins/MonoDevelop.MacDev/Makefile.am b/main/src/addins/MonoDevelop.MacDev/Makefile.am
index e4e26f00f6..c6b497e8d9 100644
--- a/main/src/addins/MonoDevelop.MacDev/Makefile.am
+++ b/main/src/addins/MonoDevelop.MacDev/Makefile.am
@@ -15,7 +15,7 @@ REFS =  \
 	$(GLIB_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
-	-r:../../../../external/monomac/src/MonoMac.dll \
+	-r:../../../external/monomac/src/MonoMac.dll \
 	-r:Mono.Cairo \
 	-r:Mono.Posix \
 	-r:System \
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am
index aac89b1279..a1c78fc19d 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am
@@ -1,9 +1,9 @@
 
 ADDIN_BUILD = $(top_builddir)/build/AddIns/VersionControl
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.VersionControl.Git.dll
-NGIT=$(top_builddir)/../external/ngit/bin/NGit.dll
-NSCH=$(top_builddir)/../external/ngit/bin/NSch.dll
-SHARPEN=$(top_builddir)/../external/ngit/bin/Sharpen.dll
+NGIT=$(top_builddir)/external/ngit/bin/NGit.dll
+NSCH=$(top_builddir)/external/ngit/bin/NSch.dll
+SHARPEN=$(top_builddir)/external/ngit/bin/Sharpen.dll
 
 DEPS =  \
 	$(top_builddir)/build/AddIns/VersionControl/MonoDevelop.VersionControl.dll \
@@ -12,9 +12,9 @@ DEPS =  \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
-	$(top_builddir)/../external/ngit/bin/NGit.dll \
-	$(top_builddir)/../external/ngit/bin/NSch.dll \
-	$(top_builddir)/../external/ngit/bin/Sharpen.dll
+	$(top_builddir)/external/ngit/bin/NGit.dll \
+	$(top_builddir)/external/ngit/bin/NSch.dll \
+	$(top_builddir)/external/ngit/bin/Sharpen.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \