diff --git a/ChangeLog b/ChangeLog index 486c8edb3..21ff453aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-18 Joe Shaw + + * */makefile: Allow a different MCS to be passed in on the make + command line. + 2002-04-09 Mike Kestner * tagging for gtk-sharp-0.1 diff --git a/atk/makefile b/atk/makefile index 2a781a70e..d65ce290e 100644 --- a/atk/makefile +++ b/atk/makefile @@ -1,3 +1,4 @@ +MCS=mcs all: @echo "You must use 'make windows' or 'make unix'." @@ -7,7 +8,7 @@ windows: $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /out:atk-sharp.dll /recurse:*.cs linux: - mcs --unsafe --target library -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll -o atk-sharp.dll --recurse *.cs + $(MCS) --unsafe --target library -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll -o atk-sharp.dll --recurse *.cs unix: @echo "'make unix' is broken for now." diff --git a/gdk/makefile b/gdk/makefile index 269d2d61b..52a422e40 100755 --- a/gdk/makefile +++ b/gdk/makefile @@ -1,3 +1,4 @@ +MCS=mcs all: @echo "You must use 'make windows' or 'make unix'." @@ -7,7 +8,7 @@ windows: $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:gdk-sharp.dll /recurse:*.cs linux: - mcs --unsafe --target library -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll -o gdk-sharp.dll --recurse *.cs + $(MCS) --unsafe --target library -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll -o gdk-sharp.dll --recurse *.cs unix: @echo "'make unix' is broken for now." diff --git a/generator/makefile b/generator/makefile index 28343608f..1f49b532f 100644 --- a/generator/makefile +++ b/generator/makefile @@ -1,3 +1,4 @@ +MCS=mcs all: @echo "You must use 'make windows' or 'make linux'." @@ -8,7 +9,7 @@ windows: ./codegen gtkapi.xml linux: - mcs --unsafe -o codegen.exe -r System.Xml.dll *.cs + $(MCS) --unsafe -o codegen.exe -r System.Xml.dll *.cs mono ./codegen.exe gtkapi.xml unix: diff --git a/glib/makefile b/glib/makefile index 4b2c73c54..0412bbf32 100755 --- a/glib/makefile +++ b/glib/makefile @@ -1,3 +1,4 @@ +MCS=mcs all: @echo "You must use 'make windows' or 'make unix'." @@ -7,7 +8,7 @@ windows: $(CSC) /unsafe /target:library /out:glib-sharp.dll /recurse:*.cs linux: - mcs --unsafe --target library -o glib-sharp.dll --recurse *.cs + $(MCS) --unsafe --target library -o glib-sharp.dll --recurse *.cs unix: @echo "'make unix' is broken for now." diff --git a/gtk/makefile b/gtk/makefile index c14d1da48..ff53752bb 100755 --- a/gtk/makefile +++ b/gtk/makefile @@ -1,3 +1,5 @@ +MCS=mcs + all: @echo "You must use 'make windows' or 'make unix'." @echo "'make unix' is broken for now." @@ -6,7 +8,7 @@ windows: $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /out:gtk-sharp.dll /recurse:*.cs linux: - mcs --unsafe --target library -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll -r ../gdk/gdk-sharp.dll -o gtk-sharp.dll --recurse *.cs + $(MCS) --unsafe --target library -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll -r ../gdk/gdk-sharp.dll -o gtk-sharp.dll --recurse *.cs unix: @echo "'make unix' is broken for now." diff --git a/makefile b/makefile index 8a140f55d..024c864a9 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,7 @@ DIRS=generator glib pango atk gdk gtk sample ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT))) CSC=$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe +MCS=mcs all: @echo "You must use 'make windows' or 'make linux'." @@ -16,5 +17,5 @@ unix: linux: for i in $(DIRS); do \ - (cd $$i; make linux) || exit 1;\ + (cd $$i; MCS="$(MCS)" make linux) || exit 1;\ done; diff --git a/pango/makefile b/pango/makefile index a5c262db8..0f68e9016 100644 --- a/pango/makefile +++ b/pango/makefile @@ -1,3 +1,4 @@ +MCS=mcs all: @echo "You must use 'make windows' or 'make unix'." @@ -7,7 +8,7 @@ windows: $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /out:pango-sharp.dll /recurse:*.cs linux: - mcs --unsafe --target library -r ../glib/glib-sharp.dll -o pango-sharp.dll --recurse *.cs + $(MCS) --unsafe --target library -r ../glib/glib-sharp.dll -o pango-sharp.dll --recurse *.cs unix: @echo "'make unix' is broken for now."