[Monodevelop-patches-list] r1982 - in trunk/MonoDevelop/Core: gdldock/gdl src/Libraries/MonoDevelop.Gui.Widgets

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-10-15 22:58:30 -0400 (Fri, 15 Oct 2004)
New Revision: 1982

Modified:
   trunk/MonoDevelop/Core/gdldock/gdl/ChangeLog
   trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am
Log:
small make CSC=foo fixes


Modified: trunk/MonoDevelop/Core/gdldock/gdl/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/gdldock/gdl/ChangeLog	2004-10-15 17:27:55 UTC (rev 1981)
+++ trunk/MonoDevelop/Core/gdldock/gdl/ChangeLog	2004-10-16 02:58:30 UTC (rev 1982)
@@ -1,3 +1,10 @@
+2004-10-16  John Luke  <john.luke at gmail.com>
+
+	* Makefile.am: remove MCS and RUNTIME
+	use $(CSC) from configure.in
+	use -target:library syntax instead of --target library
+	allows make CSC=foo to work consistently
+
 2004-05-16  Todd Berman  <tberman at sevenl.net>
 
 	* Makefile.am: use safer library referencing

Modified: trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am	2004-10-15 17:27:55 UTC (rev 1981)
+++ trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am	2004-10-16 02:58:30 UTC (rev 1982)
@@ -1,5 +1,3 @@
-MCS = mcs
-RUNTIME = mono
 ASSEMBLY = gdl-sharp.dll
 
 API = gdl-api.xml
@@ -33,7 +31,7 @@
 
 $(ASSEMBLY): $(build_sources) generated-stamp
 	mkdir -p ../../build/bin
-	$(MCS) --unsafe --target library \
+	$(CSC) --unsafe -target:library \
 	@BASE_DEPENDENCIES_LIBS@ \
 	$(build_sources) generated/*.cs /out:$(ASSEMBLY) \
 	&& cp -p $(ASSEMBLY) ../../build/bin/. \

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-10-15 17:27:55 UTC (rev 1981)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-10-16 02:58:30 UTC (rev 1982)
@@ -1,3 +1,8 @@
+2004-10-16  John Luke  <john.luke at gmail.com>
+
+	* Makefile.am: remove MCS use $(CSC) from configure.in,
+	allows make CSC=foo to work consistently
+
 2004-09-25  Todd Berman  <tberman at off.net>
 
 	* FileBrowser/FileBrowser.cs: Use a ArrayList instead of a Hashtable

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am	2004-10-15 17:27:55 UTC (rev 1981)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am	2004-10-16 02:58:30 UTC (rev 1982)
@@ -1,6 +1,4 @@
 
-MCS = mcs -debug
-
 DLL = MonoDevelop.Gui.Widgets.dll
 
 REFERENCES = /r:System.Drawing \
@@ -32,7 +30,7 @@
 all: $(DLL)
 
 $(DLL): $(build_sources)
-	$(MCS) /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \
+	$(CSC) /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \
 	&& cp $(DLL) ../../../build/bin/.
 
 assemblydir = $(libdir)/monodevelop/bin