2009-11-30 Mike Kestner <mkestner@novell.com>

* */Makefile.am: standardize on - options over / options for 
	consistency.  Also assists with build on msys. [Fixes #550667]

svn path=/trunk/gtk-sharp/; revision=147125
This commit is contained in:
Mike Kestner 2009-11-30 20:40:34 +00:00
parent 629afad2d8
commit a948792be0
13 changed files with 76 additions and 68 deletions

View file

@ -1,3 +1,8 @@
2009-11-30 Mike Kestner <mkestner@novell.com>
* */Makefile.am: standardize on - options over / options for
consistency. Also assists with build on msys. [Fixes #550667]
2009-11-30 Mike Kestner <mkestner@novell.com>
* gtk/Widget.custom: add Path method overload. [Fixes #521360]

View file

@ -53,7 +53,7 @@ $(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config $(SNK)
$(AL) -link:policy.$*.config -out:$@ -keyfile:$(SNK)
build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs
build_references = $(addprefix /r:, $(references)) $(MONO_CAIRO_LIBS)
build_references = $(addprefix -r:, $(references)) $(MONO_CAIRO_LIBS)
$(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)
@rm -f $(ASSEMBLY).mdb
@ -61,24 +61,24 @@ $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)
install-data-local:
@if test -n '$(pkg)'; then \
echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS)"; \
$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS) || exit 1; \
if test -n '$(POLICY_VERSIONS)'; then \
for i in $(POLICY_VERSIONS); do \
echo "$(GACUTIL) /i policy.$$i.$(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
$(GACUTIL) /i policy.$$i.$(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -i policy.$$i.$(ASSEMBLY) -f $(GACUTIL_FLAGS)"; \
$(GACUTIL) -i policy.$$i.$(ASSEMBLY) -f $(GACUTIL_FLAGS) || exit 1; \
done \
fi \
fi
uninstall-local:
@if test -n '$(pkg)'; then \
echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
if test -n '$(POLICY_VERSIONS)'; then \
for i in $(POLICY_VERSIONS); do \
echo "$(GACUTIL) /u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) /u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) -u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
done \
fi \
fi

View file

@ -73,14 +73,14 @@ $(ASSEMBLY): $(build_sources) mono.snk
install-data-local:
@if test -n '$(TARGET)'; then \
echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS)"; \
$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS) || exit 1; \
fi
uninstall-local:
@if test -n '$(TARGET)'; then \
echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
fi
EXTRA_DIST = $(sources)

View file

@ -19,6 +19,7 @@ case "$host" in
x86_64-*-mingw*|x86_64-*-cygwin*)
WIN64DEFINES="-define:WIN64LONGS"
platform_win32=yes
AC_MSG_RESULT([yes, 64-bit])
AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
if test "x$cross_compiling" = "xno"; then
CC="gcc -mno-cygwin -g"
@ -27,6 +28,7 @@ case "$host" in
;;
*-*-mingw*|*-*-cygwin*)
platform_win32=yes
AC_MSG_RESULT([yes, 32-bit])
AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
if test "x$cross_compiling" = "xno"; then
CC="gcc -mno-cygwin -g"
@ -35,6 +37,7 @@ case "$host" in
;;
*)
platform_win32=no
AC_MSG_RESULT([no])
;;
esac

View file

@ -67,5 +67,5 @@ EXTRA_DIST = \
$(dist_sources)
gapi_codegen.exe: $(build_sources)
$(CSC) /out:gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources)
$(CSC) $(CSFLAGS) -out:gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources)

View file

@ -104,24 +104,24 @@ $(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config gtk-sharp.snk
install-data-local:
@if test -n '$(TARGET)'; then \
echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS)"; \
$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS) || exit 1; \
if test -n '$(POLICY_VERSIONS)'; then \
for i in $(POLICY_VERSIONS); do \
echo "$(GACUTIL) /i policy.$$i.$(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
$(GACUTIL) /i policy.$$i.$(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -i policy.$$i.$(ASSEMBLY) -f $(GACUTIL_FLAGS)"; \
$(GACUTIL) -i policy.$$i.$(ASSEMBLY) -f $(GACUTIL_FLAGS) || exit 1; \
done \
fi \
fi
uninstall-local:
@if test -n '$(TARGET)'; then \
echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
if test -n '$(POLICY_VERSIONS)'; then \
for i in $(POLICY_VERSIONS); do \
echo "$(GACUTIL) /u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) /u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) -u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
done \
fi \
fi

View file

@ -46,24 +46,24 @@ $(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config gtk-sharp.snk
install-data-local:
@if test -n '$(TARGET)'; then \
echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS)"; \
$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS) || exit 1; \
if test -n '$(POLICY_VERSIONS)'; then \
for i in $(POLICY_VERSIONS); do \
echo "$(GACUTIL) /i policy.$$i.$(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \
$(GACUTIL) /i policy.$$i.$(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -i policy.$$i.$(ASSEMBLY) -f $(GACUTIL_FLAGS)"; \
$(GACUTIL) -i policy.$$i.$(ASSEMBLY) -f $(GACUTIL_FLAGS) || exit 1; \
done \
fi \
fi
uninstall-local:
@if test -n '$(TARGET)'; then \
echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
if test -n '$(POLICY_VERSIONS)'; then \
for i in $(POLICY_VERSIONS); do \
echo "$(GACUTIL) /u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) /u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
echo "$(GACUTIL) -u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
$(GACUTIL) -u policy.$$i.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \
done \
fi \
fi

View file

@ -19,8 +19,8 @@ EXTRA_DIST = \
gapi-3.0.pc.in
gapi-fixup.exe: $(srcdir)/gapi-fixup.cs
$(CSC) /out:gapi-fixup.exe $(srcdir)/gapi-fixup.cs
$(CSC) $(CSFLAGS) -out:gapi-fixup.exe $(srcdir)/gapi-fixup.cs
gapi-parser.exe: $(srcdir)/gapi-parser.cs
$(CSC) /out:gapi-parser.exe $(srcdir)/gapi-parser.cs
$(CSC) $(CSFLAGS) -out:gapi-parser.exe $(srcdir)/gapi-parser.cs

View file

@ -9,7 +9,7 @@ assemblies = \
$(top_builddir)/pango/pango-sharp.dll $(top_builddir)/atk/atk-sharp.dll \
$(top_builddir)/gdk/gdk-sharp.dll $(top_builddir)/gtk/gtk-sharp.dll
references = $(addprefix /r:, $(assemblies) $(cairo_ref))
references = $(addprefix -r:, $(assemblies) $(cairo_ref))
TARGETS = GtkDemo.exe
DEBUGS = $(addsuffix .mdb, $(TARGETS))
CLEANFILES = $(TARGETS) $(DEBUGS)
@ -76,8 +76,8 @@ image_names = \
build_sources = $(addprefix $(srcdir)/, $(sources))
build_images = $(addprefix $(srcdir)/, $(images))
resources = $(addprefix /resource:, $(build_sources), $(build_images))
resources = $(addprefix -resource:, $(build_sources), $(build_images))
GtkDemo.exe: $(build_sources) $(assemblies)
$(CSC) $(CSFLAGS) /out:GtkDemo.exe $(build_sources) $(references) $(resources)
$(CSC) $(CSFLAGS) -out:GtkDemo.exe $(build_sources) $(references) $(resources)

View file

@ -35,90 +35,90 @@ assemblies = \
$(top_builddir)/gtk/gtk-sharp.dll \
$(GLADE_ASSEMBLY)
references=$(addprefix /r:, $(assemblies))
references=$(addprefix -r:, $(assemblies))
noinst_SCRIPTS = $(TARGETS)
CLEANFILES = $(TARGETS) $(DEBUGS)
gtk-hello-world.exe: $(srcdir)/HelloWorld.cs $(assemblies)
$(CSC) /out:gtk-hello-world.exe $(references) $(srcdir)/HelloWorld.cs
$(CSC) $(CSFLAGS) -out:gtk-hello-world.exe $(references) $(srcdir)/HelloWorld.cs
button.exe: $(srcdir)/ButtonApp.cs $(assemblies)
$(CSC) /out:button.exe $(references) $(srcdir)/ButtonApp.cs
$(CSC) $(CSFLAGS) -out:button.exe $(references) $(srcdir)/ButtonApp.cs
calendar.exe: $(srcdir)/CalendarApp.cs $(assemblies)
$(CSC) /out:calendar.exe $(references) $(srcdir)/CalendarApp.cs
$(CSC) $(CSFLAGS) -out:calendar.exe $(references) $(srcdir)/CalendarApp.cs
subclass.exe: $(srcdir)/Subclass.cs $(assemblies)
$(CSC) /out:subclass.exe $(references) $(srcdir)/Subclass.cs
$(CSC) $(CSFLAGS) -out:subclass.exe $(references) $(srcdir)/Subclass.cs
menu.exe: $(srcdir)/Menu.cs $(assemblies)
$(CSC) /out:menu.exe $(references) $(srcdir)/Menu.cs
$(CSC) $(CSFLAGS) -out:menu.exe $(references) $(srcdir)/Menu.cs
native-instantiation.exe: $(srcdir)/NativeInstantiationTest.cs $(assemblies)
$(CSC) /out:native-instantiation.exe $(references) $(srcdir)/NativeInstantiationTest.cs
$(CSC) $(CSFLAGS) -out:native-instantiation.exe $(references) $(srcdir)/NativeInstantiationTest.cs
size.exe: $(srcdir)/Size.cs $(assemblies)
$(CSC) /out:size.exe $(references) $(srcdir)/Size.cs
$(CSC) $(CSFLAGS) -out:size.exe $(references) $(srcdir)/Size.cs
scribble.exe: $(srcdir)/Scribble.cs $(assemblies)
$(CSC) /out:scribble.exe $(references) $(srcdir)/Scribble.cs
$(CSC) $(CSFLAGS) -out:scribble.exe $(references) $(srcdir)/Scribble.cs
scribble-xinput.exe: $(srcdir)/ScribbleXInput.cs $(assemblies)
$(CSC) /out:scribble-xinput.exe $(references) $(srcdir)/ScribbleXInput.cs
$(CSC) $(CSFLAGS) -out:scribble-xinput.exe $(references) $(srcdir)/ScribbleXInput.cs
treeviewdemo.exe: $(srcdir)/TreeViewDemo.cs $(assemblies)
$(CSC) /out:treeviewdemo.exe $(references) $(srcdir)/TreeViewDemo.cs
$(CSC) $(CSFLAGS) -out:treeviewdemo.exe $(references) $(srcdir)/TreeViewDemo.cs
managedtreeviewdemo.exe: $(srcdir)/ManagedTreeViewDemo.cs $(assemblies)
$(CSC) /out:managedtreeviewdemo.exe $(references) $(srcdir)/ManagedTreeViewDemo.cs
$(CSC) $(CSFLAGS) -out:managedtreeviewdemo.exe $(references) $(srcdir)/ManagedTreeViewDemo.cs
nodeviewdemo.exe: $(srcdir)/NodeViewDemo.cs $(assemblies)
$(CSC) /out:nodeviewdemo.exe $(references) $(srcdir)/NodeViewDemo.cs
$(CSC) $(CSFLAGS) -out:nodeviewdemo.exe $(references) $(srcdir)/NodeViewDemo.cs
treemodeldemo.exe: $(srcdir)/TreeModelDemo.cs $(assemblies)
$(CSC) /out:treemodeldemo.exe $(references) $(srcdir)/TreeModelDemo.cs
$(CSC) $(CSFLAGS) -out:treemodeldemo.exe $(references) $(srcdir)/TreeModelDemo.cs
glade-viewer.exe: $(srcdir)/GladeViewer.cs $(assemblies)
$(CSC) /out:glade-viewer.exe $(references) $(srcdir)/GladeViewer.cs
$(CSC) $(CSFLAGS) -out:glade-viewer.exe $(references) $(srcdir)/GladeViewer.cs
glade-test.exe: $(srcdir)/GladeTest.cs $(srcdir)/test.glade $(assemblies)
$(CSC) /resource:$(srcdir)/test.glade /out:glade-test.exe $(references) $(srcdir)/GladeTest.cs
$(CSC) $(CSFLAGS) -resource:$(srcdir)/test.glade -out:glade-test.exe $(references) $(srcdir)/GladeTest.cs
cairo-sample.exe: $(srcdir)/CairoSample.cs $(assemblies)
$(CSC) /out:cairo-sample.exe $(references) $(cairo_ref) $(srcdir)/CairoSample.cs
$(CSC) $(CSFLAGS) -out:cairo-sample.exe $(references) $(cairo_ref) $(srcdir)/CairoSample.cs
testdnd.exe: $(srcdir)/TestDnd.cs $(assemblies)
$(CSC) /debug /unsafe /out:testdnd.exe $(references) $(srcdir)/TestDnd.cs
$(CSC) $(CSFLAGS) -unsafe -out:testdnd.exe $(references) $(srcdir)/TestDnd.cs
custom-cellrenderer.exe: $(srcdir)/CustomCellRenderer.cs $(assemblies)
$(CSC) /debug /out:custom-cellrenderer.exe $(references) $(srcdir)/CustomCellRenderer.cs
$(CSC) $(CSFLAGS) -out:custom-cellrenderer.exe $(references) $(srcdir)/CustomCellRenderer.cs
dotnet_references = $(references) $(addprefix -r:, $(DOTNET_ASSEMBLY)) -r:System.Drawing.dll
drawing-sample.exe: $(srcdir)/DrawingSample.cs $(assemblies) $(DOTNET_ASSEMBLIES)
$(CSC) /debug /out:drawing-sample.exe $(dotnet_references) $(srcdir)/DrawingSample.cs
$(CSC) $(CSFLAGS) -out:drawing-sample.exe $(dotnet_references) $(srcdir)/DrawingSample.cs
custom-widget.exe: $(srcdir)/CustomWidget.cs $(assemblies)
$(CSC) /debug /out:custom-widget.exe $(references) $(srcdir)/CustomWidget.cs
$(CSC) $(CSFLAGS) -out:custom-widget.exe $(references) $(srcdir)/CustomWidget.cs
actions.exe: $(srcdir)/Actions.cs
$(CSC) /debug /unsafe /out:actions.exe $(references) $(srcdir)/Actions.cs
$(CSC) $(CSFLAGS) -unsafe -out:actions.exe $(references) $(srcdir)/Actions.cs
polarfixed.exe: $(srcdir)/PolarFixed.cs $(assemblies)
$(CSC) /debug /out:polarfixed.exe $(references) $(srcdir)/PolarFixed.cs
$(CSC) $(CSFLAGS) -out:polarfixed.exe $(references) $(srcdir)/PolarFixed.cs
spawn.exe: $(srcdir)/SpawnTests.cs $(assemblies)
$(CSC) /out:spawn.exe $(references) $(srcdir)/SpawnTests.cs
$(CSC) $(CSFLAGS) -out:spawn.exe $(references) $(srcdir)/SpawnTests.cs
assistant.exe: $(srcdir)/Assistant.cs $(assemblies)
$(CSC) /out:assistant.exe $(references) $(srcdir)/Assistant.cs
$(CSC) $(CSFLAGS) -out:assistant.exe $(references) $(srcdir)/Assistant.cs
registerprop.exe: $(srcdir)/PropertyRegistration.cs $(assemblies)
$(CSC) /out:registerprop.exe $(references) $(srcdir)/PropertyRegistration.cs
$(CSC) $(CSFLAGS) -out:registerprop.exe $(references) $(srcdir)/PropertyRegistration.cs
gexceptiontest.exe: $(srcdir)/GExceptionTest.cs $(assemblies)
$(CSC) /out:gexceptiontest.exe $(references) $(srcdir)/GExceptionTest.cs
$(CSC) $(CSFLAGS) -out:gexceptiontest.exe $(references) $(srcdir)/GExceptionTest.cs
EXTRA_DIST = \
HelloWorld.cs \

View file

@ -2,10 +2,10 @@ noinst_SCRIPTS = opaquetest.exe
lib_LTLIBRARIES = libopaque.la
assemblies=../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll
references=$(addprefix /r:, $(assemblies))
references=$(addprefix -r:, $(assemblies))
opaquetest.exe: OpaqueTest.cs generated/*.cs $(assemblies)
$(CSC) /out:opaquetest.exe $(references) $(srcdir)/OpaqueTest.cs $(GENERATED_SOURCES)
$(CSC) $(CSFLAGS) -out:opaquetest.exe $(references) $(srcdir)/OpaqueTest.cs $(GENERATED_SOURCES)
libopaque_la_SOURCES = \
opaques.c \

View file

@ -1,7 +1,7 @@
TARGETS = WidgetViewer.exe
assemblies=../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll
references = $(addprefix /r:, $(assemblies))
references = $(addprefix -r:, $(assemblies))
noinst_SCRIPTS = $(TARGETS)
CLEANFILES = $(TARGETS)
@ -24,5 +24,5 @@ sources = \
build_sources = $(addprefix $(srcdir)/, $(sources))
WidgetViewer.exe: $(build_sources) $(assemblies)
$(CSC) /out:WidgetViewer.exe $(references) $(build_sources)
$(CSC) $(CSFLAGS) -out:WidgetViewer.exe $(references) $(build_sources)

View file

@ -2,10 +2,10 @@ noinst_SCRIPTS = valtest.exe
lib_LTLIBRARIES = libvalobj.la
assemblies=../../glib/glib-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll
references=$(addprefix /r:, $(assemblies))
references=$(addprefix -r:, $(assemblies))
valtest.exe: Valtest.cs Valobj.cs $(assemblies)
$(CSC) /out:valtest.exe $(references) $(srcdir)/Valtest.cs Valobj.cs
$(CSC) $(CSFLAGS) -out:valtest.exe $(references) $(srcdir)/Valtest.cs Valobj.cs
libvalobj_la_SOURCES = \
valobj.c \