ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2024-12-23 16:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

2004-06-11 Mike Kestner <mkestner@ximian.com>

Browse source 
* configure.in : deal with a csc-ism in source paths.
	* */Makefile.am : use the GENERATED_SOURCES var.
	* */glue/Makefile.am : add -no-undefined for win32 dll builds.

svn path=/trunk/gtk-sharp/; revision=29367
This commit is contained in:
Mike Kestner 2004-06-11 18:19:41 +00:00
parent 725f65261c
commit 112f066abf
22 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-06-11 Mike Kestner <mkestner@ximian.com>
* configure.in : deal with a csc-ism in source paths.
* */Makefile.am : use the GENERATED_SOURCES var.
* */glue/Makefile.am : add -no-undefined for win32 dll builds.
2004-06-10 Mike Kestner <mkestner@ximian.com> 2004-06-10 Mike Kestner <mkestner@ximian.com>
* configure.in : break the monodoc dep, even though it was optional * configure.in : break the monodoc dep, even though it was optional

2
art/Makefile.am
View file

@ -58,7 +58,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \

2
atk/Makefile.am
View file

@ -47,7 +47,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \

2
atk/glue/Makefile.am
View file

@ -1,6 +1,6 @@
lib_LTLIBRARIES = libatksharpglue.la lib_LTLIBRARIES = libatksharpglue.la
libatksharpglue_la_LDFLAGS = -module -avoid-version libatksharpglue_la_LDFLAGS = -module -avoid-version -no-undefined
libatksharpglue_la_SOURCES = \ libatksharpglue_la_SOURCES = \
generated.c \ generated.c \

4
configure.in
View file

@ -28,6 +28,7 @@ AC_SUBST(BUILD_EXEEXT)
# Set STDC_HEADERS # Set STDC_HEADERS
AC_HEADER_STDC AC_HEADER_STDC
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
# not 64 bit clean in cross-compile # not 64 bit clean in cross-compile
@ -64,6 +65,7 @@ PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true
if test "x$has_mono" = "xtrue"; then if test "x$has_mono" = "xtrue"; then
GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(libdir)' GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(libdir)'
GENERATED_SOURCES=generated/*.cs
if test `uname -s` = "Darwin"; then if test `uname -s` = "Darwin"; then
AC_PATH_PROG(RUNTIME, mint, no) AC_PATH_PROG(RUNTIME, mint, no)
AC_PATH_PROG(CSC, mcs, no) AC_PATH_PROG(CSC, mcs, no)
@ -78,6 +80,7 @@ fi
else else
AC_PATH_PROG(CSC, csc.exe, no) AC_PATH_PROG(CSC, csc.exe, no)
GACUTIL_FLAGS= GACUTIL_FLAGS=
GENERATED_SOURCES=generated\\\\*.cs
if test x$CSC = "xno"; then if test x$CSC = "xno"; then
AC_MSG_ERROR([You need to install either mono or .Net]) AC_MSG_ERROR([You need to install either mono or .Net])
@ -104,6 +107,7 @@ AC_SUBST(GACUTIL)
AC_SUBST(GACUTIL_FLAGS) AC_SUBST(GACUTIL_FLAGS)
AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_PREFIX)
AC_SUBST(LIB_SUFFIX) AC_SUBST(LIB_SUFFIX)
AC_SUBST(GENERATED_SOURCES)
PKG_CHECK_MODULES(GLIB, glib-2.0) PKG_CHECK_MODULES(GLIB, glib-2.0)
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_CFLAGS)

2
gda/Makefile.am
View file

@ -55,7 +55,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \

2
gdk/Makefile.am
View file

@ -85,7 +85,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \

2
gdk/glue/Makefile.am
View file

@ -10,7 +10,7 @@ libgdksharpglue_la_SOURCES = \
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32
libgdksharpglue_la_LDFLAGS = -module -avoid-version libgdksharpglue_la_LDFLAGS = -module -avoid-version -no-undefined
libgdksharpglue_la_LIBADD = $(GTK_LIBS) libgdksharpglue_la_LIBADD = $(GTK_LIBS)

2
glade/Makefile.am
View file

@ -61,7 +61,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \

2
glade/glue/Makefile.am
View file

@ -6,7 +6,7 @@ else
TARGET = TARGET =
endif endif
libgladesharpglue_la_LDFLAGS = -module -avoid-version libgladesharpglue_la_LDFLAGS = -module -avoid-version -no-undefined
libgladesharpglue_la_SOURCES = \ libgladesharpglue_la_SOURCES = \
gladexml.c gladexml.c

2
glib/glue/Makefile.am
View file

@ -1,6 +1,6 @@
lib_LTLIBRARIES = libglibsharpglue.la lib_LTLIBRARIES = libglibsharpglue.la
libglibsharpglue_la_LDFLAGS = -module -avoid-version libglibsharpglue_la_LDFLAGS = -module -avoid-version -no-undefined
libglibsharpglue_la_SOURCES = \ libglibsharpglue_la_SOURCES = \
error.c \ error.c \

2
gnome/Makefile.am
View file

@ -91,7 +91,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \

2
gnome/glue/Makefile.am
View file

@ -6,7 +6,7 @@ else
TARGET = TARGET =
endif endif
libgnomesharpglue_la_LDFLAGS = -module -avoid-version libgnomesharpglue_la_LDFLAGS = -module -avoid-version -no-undefined
libgnomesharpglue_la_SOURCES = \ libgnomesharpglue_la_SOURCES = \
canvas.c \ canvas.c \

2
gnomedb/Makefile.am
View file

@ -55,7 +55,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \

2
gtk/Makefile.am
View file

@ -116,7 +116,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \

2
gtk/glue/Makefile.am
View file

@ -22,7 +22,7 @@ libgtksharpglue_la_SOURCES = \
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32
libgtksharpglue_la_LDFLAGS = -module -avoid-version libgtksharpglue_la_LDFLAGS = -module -avoid-version -no-undefined
libgtksharpglue_la_LIBADD = $(GTK_LIBS) libgtksharpglue_la_LIBADD = $(GTK_LIBS)

2
gtkhtml/Makefile.am
View file

@ -56,7 +56,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \

2
pango/Makefile.am
View file

@ -53,7 +53,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \

2
pango/glue/Makefile.am
View file

@ -6,7 +6,7 @@ libpangosharpglue_la_SOURCES = \
# Adding a new glue file? # Adding a new glue file?
# Please remember to update makefile.win32 # Please remember to update makefile.win32
libpangosharpglue_la_LDFLAGS = -module -avoid-version libpangosharpglue_la_LDFLAGS = -module -avoid-version -no-undefined
libpangosharpglue_la_LIBADD = $(PANGO_LIBS) libpangosharpglue_la_LIBADD = $(PANGO_LIBS)

2
rsvg/Makefile.am
View file

@ -56,7 +56,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \

2
sample/Makefile.am
View file

@ -24,7 +24,7 @@ VTE_TARGETS=
VTE_ASSEMBLY= VTE_ASSEMBLY=
endif endif
TARGETS = custom-cellrenderer.exe gtk-hello-world.exe button.exe calendar.exe subclass.exe menu.exe size.exe scribble.exe treeviewdemo.exe managedtreeviewdemo.exe testdnd.exe drawing-sample.exe custom-widget.exe $(GNOME_TARGETS) $(GLADE_TARGETS) $(VTE_TARGETS) TARGETS = custom-cellrenderer.exe gtk-hello-world.exe button.exe calendar.exe subclass.exe menu.exe size.exe scribble.exe treeviewdemo.exe managedtreeviewdemo.exe testdnd.exe custom-widget.exe $(GNOME_TARGETS) $(GLADE_TARGETS) $(VTE_TARGETS)
assemblies=../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll $(GNOME_ASSEMBLY) $(GLADE_ASSEMBLY) $(VTE_ASSEMBLY) assemblies=../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll $(GNOME_ASSEMBLY) $(GLADE_ASSEMBLY) $(VTE_ASSEMBLY)
references=$(addprefix /r:, $(assemblies)) references=$(addprefix /r:, $(assemblies))

2
vte/Makefile.am
View file

@ -54,7 +54,7 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk . cp $(top_srcdir)/gtk-sharp.snk .
$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk
$(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES)
install-data-local: install-data-local:
@if test -n '$(TARGET)'; then \ @if test -n '$(TARGET)'; then \