[Mono.CSharp] Simplify .sources structure

8 files changed, 6 insertions, 22 deletions

diff --git a/mcs/class/Mono.CSharp/Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/Mono.CSharp.dll.sources
index 0bbd93782ba..2bd1a5a5f41 100644
--- a/mcs/class/Mono.CSharp/Mono.CSharp.dll.sources
+++ b/mcs/class/Mono.CSharp/Mono.CSharp.dll.sources
@@ -1,3 +1,5 @@
+Assembly/AssemblyInfo.cs
+aot.cs
 ../../mcs/anonymous.cs
 ../../mcs/argument.cs
 ../../mcs/assign.cs
@@ -55,4 +57,3 @@
 ../../build/common/Consts.cs
 ../../tools/monop/outline.cs
 ../../mcs/cs-parser.cs
-Assembly/AssemblyInfo.cs
diff --git a/mcs/class/Mono.CSharp/monotouch.cs b/mcs/class/Mono.CSharp/aot.cs
index ecede71ac36..844d761ae6a 100644
--- a/mcs/class/Mono.CSharp/monotouch.cs
+++ b/mcs/class/Mono.CSharp/aot.cs
@@ -1,5 +1,5 @@
 //
-// monotouch.cs: iOS System.Reflection.Emit API needed to simplify mcs compilation
+// aot.cs: AOT System.Reflection.Emit extensions to simplify mcs compilation
 //
 // Authors:
 //	Marek Safar  <marek.safar@gmail.com>
@@ -26,6 +26,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if FULL_AOT_RUNTIME
+
 namespace System.Reflection.Emit
 {
 	static class AssemblyBuilderExtensions
@@ -68,10 +70,6 @@ namespace System.Reflection.Emit
 			throw new NotSupportedException ();
 		}
 
-		public static MethodToken GetToken (this ConstructorBuilder builder)
-		{
-			throw new NotSupportedException ();
-		}
 	}
 
 	static class MethodBuilderExtensions
@@ -81,10 +79,6 @@ namespace System.Reflection.Emit
 			throw new NotSupportedException ();
 		}
 
-		public static MethodToken GetToken (this MethodBuilder builder)
-		{
-			throw new NotSupportedException ();
-		}
 	}
 
 	static class ModuleBuilderExtensions
@@ -108,3 +102,4 @@ namespace System.Reflection.Emit
 		}
 	}
 }
+#endif
diff --git a/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources
deleted file mode 100644
index 083e61afd3f..00000000000
--- a/mcs/class/Mono.CSharp/monotouch_Mono.CSharp.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include testing_aot_full_Mono.CSharp.dll.sources
diff --git a/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources
deleted file mode 100644
index 083e61afd3f..00000000000
--- a/mcs/class/Mono.CSharp/monotouch_tv_Mono.CSharp.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include testing_aot_full_Mono.CSharp.dll.sources
diff --git a/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources
deleted file mode 100644
index 083e61afd3f..00000000000
--- a/mcs/class/Mono.CSharp/monotouch_watch_Mono.CSharp.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include testing_aot_full_Mono.CSharp.dll.sources
diff --git a/mcs/class/Mono.CSharp/orbis_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/orbis_Mono.CSharp.dll.sources
deleted file mode 100644
index 394cd48583b..00000000000
--- a/mcs/class/Mono.CSharp/orbis_Mono.CSharp.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include monotouch_Mono.CSharp.dll.sources
diff --git a/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp.dll.sources
deleted file mode 100644
index 4c30fc6e148..00000000000
--- a/mcs/class/Mono.CSharp/testing_aot_full_Mono.CSharp.dll.sources
+++ /dev/null
@@ -1,4 +0,0 @@
-#include Mono.CSharp.dll.sources
-../corlib/System.Reflection.Emit/PEFileKinds.cs
-../corlib/System.Reflection.Emit/MethodToken.cs
-monotouch.cs
diff --git a/mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources b/mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources
deleted file mode 100644
index 4c30fc6e148..00000000000
--- a/mcs/class/Mono.CSharp/winaot_Mono.CSharp.dll.sources
+++ /dev/null
@@ -1,4 +0,0 @@
-#include Mono.CSharp.dll.sources
-../corlib/System.Reflection.Emit/PEFileKinds.cs
-../corlib/System.Reflection.Emit/MethodToken.cs
-monotouch.cs