From 9bc8928f88e3ee82784093a688220cbb0d0bb8e5 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 29 Apr 2004 15:00:24 +0000 Subject: [PATCH] 2004-04-29 Mike Kestner * configure.in : expand the new config files. * */*config.in : the per-assembly config files. * */Makefile.am : dist, clean, and install the configs. * gnome/*.c* : fix some errant DllImports. svn path=/trunk/gtk-sharp/; revision=26301 --- ChangeLog | 7 +++++++ art/.cvsignore | 1 + art/Makefile.am | 5 +++-- art/art-sharp.dll.config.in | 3 +++ atk/.cvsignore | 1 + atk/Makefile.am | 14 ++++++++------ atk/atk-sharp.dll.config.in | 4 ++++ configure.in | 22 ++++++++++++++++++++++ gconf/GConf/.cvsignore | 1 + gconf/GConf/Makefile.am | 7 +++++-- gconf/GConf/gconf-sharp.dll.config.in | 3 +++ gda/.cvsignore | 1 + gda/Makefile.am | 5 +++-- gda/gda-sharp.dll.config.in | 4 ++++ gdk/.cvsignore | 1 + gdk/Makefile.am | 4 +++- gdk/gdk-sharp.dll.config.in | 6 ++++++ glade/.cvsignore | 1 + glade/Makefile.am | 5 +++-- glade/glade-sharp.dll.config.in | 3 +++ glib/.cvsignore | 1 + glib/Makefile.am | 8 +++++--- glib/glib-sharp.dll.config.in | 5 +++++ gnome/.cvsignore | 1 + gnome/Makefile.am | 5 +++-- gnome/Modules.cs | 4 ++-- gnome/Program.custom | 2 +- gnome/gnome-sharp.dll.config.in | 11 +++++++++++ gnome/voidObjectAffineSVPintSignal.cs | 2 +- gnomedb/.cvsignore | 1 + gnomedb/Makefile.am | 5 +++-- gnomedb/gnomedb-sharp.dll.config.in | 4 ++++ gtk/.cvsignore | 1 + gtk/Makefile.am | 4 +++- gtk/gtk-sharp.dll.config.in | 6 ++++++ gtkhtml/.cvsignore | 1 + gtkhtml/Makefile.am | 5 +++-- gtkhtml/gtkhtml-sharp.dll.config.in | 4 ++++ pango/.cvsignore | 1 + pango/Makefile.am | 14 ++++++++------ pango/pango-sharp.dll.config.in | 4 ++++ rsvg/.cvsignore | 1 + rsvg/Makefile.am | 5 +++-- rsvg/rsvg-sharp.dll.config.in | 3 +++ vte/.cvsignore | 1 + vte/Makefile.am | 5 +++-- vte/vte-sharp.dll.config.in | 6 ++++++ 47 files changed, 169 insertions(+), 39 deletions(-) create mode 100644 art/art-sharp.dll.config.in create mode 100644 atk/atk-sharp.dll.config.in create mode 100644 gconf/GConf/gconf-sharp.dll.config.in create mode 100644 gda/gda-sharp.dll.config.in create mode 100644 gdk/gdk-sharp.dll.config.in create mode 100644 glade/glade-sharp.dll.config.in create mode 100644 glib/glib-sharp.dll.config.in create mode 100644 gnome/gnome-sharp.dll.config.in create mode 100644 gnomedb/gnomedb-sharp.dll.config.in create mode 100644 gtk/gtk-sharp.dll.config.in create mode 100644 gtkhtml/gtkhtml-sharp.dll.config.in create mode 100644 pango/pango-sharp.dll.config.in create mode 100644 rsvg/rsvg-sharp.dll.config.in create mode 100644 vte/vte-sharp.dll.config.in diff --git a/ChangeLog b/ChangeLog index ddb02aa99..0c494a40c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-04-29 Mike Kestner + + * configure.in : expand the new config files. + * */*config.in : the per-assembly config files. + * */Makefile.am : dist, clean, and install the configs. + * gnome/*.c* : fix some errant DllImports. + 2004-04-28 Mike Kestner [Expanded from patch by John Luke attached to bug.] diff --git a/art/.cvsignore b/art/.cvsignore index a2addc504..1c5ace8d9 100755 --- a/art/.cvsignore +++ b/art/.cvsignore @@ -1,5 +1,6 @@ art-sharp.pc *.dll +*.dll.config generated generated-stamp Makefile diff --git a/art/Makefile.am b/art/Makefile.am index d3c6a5018..32c1266a6 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -1,5 +1,5 @@ if ENABLE_LIBART -TARGET = $(ASSEMBLY) +TARGET = $(ASSEMBLY) $(ASSEMBLY).config APIS = $(API) $(ADDITIONAL_API) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = art-sharp.pc @@ -22,7 +22,7 @@ assembly_DATA = $(TARGET) api_DATA = $(APIS) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) -DISTCLEANFILES = art-sharp.pc +DISTCLEANFILES = art-sharp.pc $(ASSEMBLY).config sources = @@ -37,6 +37,7 @@ dist_customs = $(customs) EXTRA_DIST = \ $(RAW_API) \ $(ADDITIONAL_API) \ + $(ASSEMBLY).config.in \ $(METADATA) \ $(dist_customs) \ $(dist_sources) \ diff --git a/art/art-sharp.dll.config.in b/art/art-sharp.dll.config.in new file mode 100644 index 000000000..a9bb7995b --- /dev/null +++ b/art/art-sharp.dll.config.in @@ -0,0 +1,3 @@ + + + diff --git a/atk/.cvsignore b/atk/.cvsignore index 4562d9438..8b6a98fdd 100644 --- a/atk/.cvsignore +++ b/atk/.cvsignore @@ -1,4 +1,5 @@ *.dll +*.dll.config generated generated-stamp Makefile diff --git a/atk/Makefile.am b/atk/Makefile.am index 038473eb3..d05526633 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -9,9 +9,10 @@ references = /r:../glib/glib-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(ASSEMBLY) +assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c +DISTCLEANFILES = $(ASSEMBLY).config sources = @@ -21,11 +22,12 @@ customs = build_customs = $(addprefix $(srcdir)/, $(customs)) -EXTRA_DIST = \ - makefile.win32 \ - $(RAW_API) \ - $(METADATA) \ - $(customs) \ +EXTRA_DIST = \ + makefile.win32 \ + $(RAW_API) \ + $(ASSEMBLY).config.in \ + $(METADATA) \ + $(customs) \ $(sources) $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) diff --git a/atk/atk-sharp.dll.config.in b/atk/atk-sharp.dll.config.in new file mode 100644 index 000000000..32f431fee --- /dev/null +++ b/atk/atk-sharp.dll.config.in @@ -0,0 +1,4 @@ + + + + diff --git a/configure.in b/configure.in index d3973fcfb..305574f2b 100644 --- a/configure.in +++ b/configure.in @@ -62,9 +62,13 @@ if test "x$has_mono" = "xtrue"; then if test `uname -s` = "Darwin"; then AC_PATH_PROG(RUNTIME, mint, no) AC_PATH_PROG(CSC, mcs, no) + LIB_PREFIX= + LIB_SUFFIX=.dylib else AC_PATH_PROG(RUNTIME, mono, no) AC_PATH_PROG(CSC, mcs, no) + LIB_PREFIX=.so + LIB_SUFFIX= fi else AC_PATH_PROG(CSC, csc.exe, no) @@ -72,6 +76,8 @@ if test x$CSC = "xno"; then AC_MSG_ERROR([You need to install either mono or .Net]) else RUNTIME= +LIB_PREFIX= +LIB_SUFFIX=.dylib fi fi @@ -82,6 +88,8 @@ fi AC_SUBST(RUNTIME) AC_SUBST(CSC) +AC_SUBST(LIB_PREFIX) +AC_SUBST(LIB_SUFFIX) MONODOC_REQUIRED_VERSION=0.12 PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enable_monodoc=yes, enable_monodoc=no) @@ -184,37 +192,51 @@ parser/GAPI/Makefile generator/Makefile generator/gapi-codegen glib/Makefile +glib/glib-sharp.dll.config glib/glue/Makefile pango/Makefile +pango/pango-sharp.dll.config atk/Makefile +atk/atk-sharp.dll.config art/Makefile +art/art-sharp.dll.config art/art-sharp.pc gdk/Makefile +gdk/gdk-sharp.dll.config gdk/glue/Makefile gtk/Makefile +gtk/gtk-sharp.dll.config gtk/glue/Makefile glade/Makefile +glade/glade-sharp.dll.config glade/glade-sharp.pc glade/glue/Makefile gnome/Makefile +gnome/gnome-sharp.dll.config gnome/gnome-sharp.pc gnome/glue/Makefile gda/Makefile +gda/gda-sharp.dll.config gda/gda-sharp.pc gnomedb/Makefile +gnomedb/gnomedb-sharp.dll.config gnomedb/gnomedb-sharp.pc gconf/Makefile gconf/doc/Makefile gconf/GConf/Makefile +gconf/GConf/gconf-sharp.dll.config gconf/GConf/gconf-sharp.pc gconf/GConf.PropertyEditors/Makefile gconf/tools/Makefile gconf/tools/gconfsharp-schemagen gtkhtml/Makefile +gtkhtml/gtkhtml-sharp.dll.config gtkhtml/gtkhtml-sharp.pc rsvg/Makefile +rsvg/rsvg-sharp.dll.config rsvg/rsvg-sharp.pc vte/Makefile +vte/vte-sharp.dll.config vte/vte-sharp.pc doc/Makefile sample/GtkDemo/Makefile diff --git a/gconf/GConf/.cvsignore b/gconf/GConf/.cvsignore index 336d26b31..b53200859 100644 --- a/gconf/GConf/.cvsignore +++ b/gconf/GConf/.cvsignore @@ -2,3 +2,4 @@ gconf-sharp.pc Makefile Makefile.in *.dll +*.dll.config diff --git a/gconf/GConf/Makefile.am b/gconf/GConf/Makefile.am index 843664f11..a95055aac 100644 --- a/gconf/GConf/Makefile.am +++ b/gconf/GConf/Makefile.am @@ -1,18 +1,21 @@ if ENABLE_GNOME ASSEMBLY = gconf-sharp.dll +TARGETS = $(ASSEMBLY) $(ASSEMBLY).config pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gconf-sharp.pc else ASSEMBLY = +TARGETS = endif assemblydir = $(libdir) -assembly_DATA = $(ASSEMBLY) +assembly_DATA = $(TARGETS) CLEANFILES = $(ASSEMBLY) -DISTCLEANFILES = gconf-sharp.pc +DISTCLEANFILES = gconf-sharp.pc $(ASSEMBLY).config EXTRA_DIST = \ $(sources) \ + $(ASSEMBLY).config.in \ gconf-sharp.pc.in references = \ diff --git a/gconf/GConf/gconf-sharp.dll.config.in b/gconf/GConf/gconf-sharp.dll.config.in new file mode 100644 index 000000000..9fb7d15dc --- /dev/null +++ b/gconf/GConf/gconf-sharp.dll.config.in @@ -0,0 +1,3 @@ + + + diff --git a/gda/.cvsignore b/gda/.cvsignore index 23d0a763d..c52972de9 100755 --- a/gda/.cvsignore +++ b/gda/.cvsignore @@ -1,5 +1,6 @@ gda-sharp.pc *.dll +*.dll.config generated generated-stamp Makefile diff --git a/gda/Makefile.am b/gda/Makefile.am index a1ee1e713..3943517a3 100644 --- a/gda/Makefile.am +++ b/gda/Makefile.am @@ -1,5 +1,5 @@ if ENABLE_GDA -TARGET = $(ASSEMBLY) +TARGET = $(ASSEMBLY) $(ASSEMBLY).config APIS = $(API) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gda-sharp.pc @@ -21,7 +21,7 @@ assembly_DATA = $(TARGET) gapi_DATA = $(APIS) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) -DISTCLEANFILES = gda-sharp.pc +DISTCLEANFILES = gda-sharp.pc $(ASSEMBLY).config sources = \ Application.cs @@ -34,6 +34,7 @@ build_customs = $(addprefix $(srcdir)/, $(customs)) EXTRA_DIST = \ $(RAW_API) \ + $(ASSEMBLY).config.in \ $(METADATA) \ $(customs) \ $(sources) \ diff --git a/gda/gda-sharp.dll.config.in b/gda/gda-sharp.dll.config.in new file mode 100644 index 000000000..02f1b6fb5 --- /dev/null +++ b/gda/gda-sharp.dll.config.in @@ -0,0 +1,4 @@ + + + + diff --git a/gdk/.cvsignore b/gdk/.cvsignore index 4562d9438..8b6a98fdd 100644 --- a/gdk/.cvsignore +++ b/gdk/.cvsignore @@ -1,4 +1,5 @@ *.dll +*.dll.config generated generated-stamp Makefile diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 516f3ae28..86eb9100c 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -11,9 +11,10 @@ references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(ASSEMBLY) +assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) $(ADDITIONAL_API) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c +DISTCLEANFILES = $(ASSEMBLY).config sources = \ EventButton.cs \ @@ -60,6 +61,7 @@ build_customs = $(addprefix $(srcdir)/, $(customs)) EXTRA_DIST = \ makefile.win32 \ + $(ASSEMBLY).config.in \ $(RAW_API) \ $(ADDITIONAL_API) \ $(METADATA) \ diff --git a/gdk/gdk-sharp.dll.config.in b/gdk/gdk-sharp.dll.config.in new file mode 100644 index 000000000..0924374e0 --- /dev/null +++ b/gdk/gdk-sharp.dll.config.in @@ -0,0 +1,6 @@ + + + + + + diff --git a/glade/.cvsignore b/glade/.cvsignore index dc6192620..09adaa38e 100755 --- a/glade/.cvsignore +++ b/glade/.cvsignore @@ -1,5 +1,6 @@ glade-sharp.pc *.dll +*.dll.config generated generated-stamp Makefile diff --git a/glade/Makefile.am b/glade/Makefile.am index e4591798f..5ba2a4202 100644 --- a/glade/Makefile.am +++ b/glade/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = glue if ENABLE_GLADE -TARGET = $(ASSEMBLY) +TARGET = $(ASSEMBLY) $(ASSEMBLY).config APIS = $(API) $(ADDITIONAL_API) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = glade-sharp.pc @@ -24,7 +24,7 @@ assembly_DATA = $(TARGET) gapi_DATA = $(APIS) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) -DISTCLEANFILES = glade-sharp.pc +DISTCLEANFILES = glade-sharp.pc $(ASSEMBLY).config sources = \ HandlerNotFoundExeception.cs \ @@ -39,6 +39,7 @@ build_customs = $(addprefix $(srcdir)/, $(customs)) EXTRA_DIST = \ makefile.win32 \ + $(ASSEMBLY).config.in \ $(RAW_API) \ $(METADATA) \ $(customs) \ diff --git a/glade/glade-sharp.dll.config.in b/glade/glade-sharp.dll.config.in new file mode 100644 index 000000000..bde08bda6 --- /dev/null +++ b/glade/glade-sharp.dll.config.in @@ -0,0 +1,3 @@ + + + diff --git a/glib/.cvsignore b/glib/.cvsignore index 76489f390..69324f20a 100755 --- a/glib/.cvsignore +++ b/glib/.cvsignore @@ -1,4 +1,5 @@ *.dll +*.dll.config *.exe *.xml generated diff --git a/glib/Makefile.am b/glib/Makefile.am index a790bf426..446833167 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -2,8 +2,9 @@ SUBDIRS = glue ASSEMBLY = glib-sharp.dll assemblydir = $(libdir) -assembly_DATA = $(ASSEMBLY) +assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config CLEANFILES = $(ASSEMBLY) +DISTCLEANFILES = $(ASSEMBLY).config references = @@ -45,8 +46,9 @@ sources = \ build_sources = $(addprefix $(srcdir)/, $(sources)) dist_sources = $(sources) -EXTRA_DIST = \ - $(dist_sources) \ +EXTRA_DIST = \ + $(dist_sources) \ + $(ASSEMBLY).config.in \ makefile.win32 $(ASSEMBLY): $(build_sources) diff --git a/glib/glib-sharp.dll.config.in b/glib/glib-sharp.dll.config.in new file mode 100644 index 000000000..5a5e136fe --- /dev/null +++ b/glib/glib-sharp.dll.config.in @@ -0,0 +1,5 @@ + + + + + diff --git a/gnome/.cvsignore b/gnome/.cvsignore index e606c6252..8b3004234 100644 --- a/gnome/.cvsignore +++ b/gnome/.cvsignore @@ -1,5 +1,6 @@ gnome-sharp.pc *.dll +*.dll.config generated generated-stamp Makefile diff --git a/gnome/Makefile.am b/gnome/Makefile.am index 662075cde..d77b0a4de 100644 --- a/gnome/Makefile.am +++ b/gnome/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = glue if ENABLE_GNOME -TARGET = $(ASSEMBLY) +TARGET = $(ASSEMBLY) $(ASSEMBLY).config APIS = $(API) pkgconfigdir = $(libdir)/pkgconfig @@ -26,7 +26,7 @@ assembly_DATA = $(TARGET) gapi_DATA = $(APIS) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) -DISTCLEANFILES = gnome-sharp.pc +DISTCLEANFILES = gnome-sharp.pc $(ASSEMBLY).config sources = \ CanvasProxy.cs \ @@ -71,6 +71,7 @@ build_customs = $(addprefix $(srcdir)/, $(customs)) EXTRA_DIST = \ $(RAW_API) \ + $(ASSEMBLY).config.in \ $(METADATA) \ $(customs) \ $(sources) \ diff --git a/gnome/Modules.cs b/gnome/Modules.cs index a56909d52..fc3986c9a 100644 --- a/gnome/Modules.cs +++ b/gnome/Modules.cs @@ -5,9 +5,9 @@ namespace Gnome public class Modules { - [DllImport("libgnome-2.so.0")] + [DllImport("gnome-2")] static extern System.IntPtr libgnome_module_info_get (); - [DllImport("libgnomeui-2.so.0")] + [DllImport("gnomeui-2")] static extern System.IntPtr libgnomeui_module_info_get (); public static ModuleInfo LibGnome { diff --git a/gnome/Program.custom b/gnome/Program.custom index 55a9d7aa6..e280b2d24 100644 --- a/gnome/Program.custom +++ b/gnome/Program.custom @@ -8,7 +8,7 @@ // This code is inserted after the automatically generated code. // -[DllImport("gobject-2.0")] +[DllImport("libgobject-2.0-0.dll")] static extern void g_type_init (); [StructLayout(LayoutKind.Sequential)] diff --git a/gnome/gnome-sharp.dll.config.in b/gnome/gnome-sharp.dll.config.in new file mode 100644 index 000000000..ef7c5d5e8 --- /dev/null +++ b/gnome/gnome-sharp.dll.config.in @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/gnome/voidObjectAffineSVPintSignal.cs b/gnome/voidObjectAffineSVPintSignal.cs index 9268f1e6d..24b5448a8 100644 --- a/gnome/voidObjectAffineSVPintSignal.cs +++ b/gnome/voidObjectAffineSVPintSignal.cs @@ -36,7 +36,7 @@ namespace GtkSharp { inst._handler.DynamicInvoke(argv); } - [DllImport("gobject-2.0")] static extern void g_signal_connect_data(IntPtr obj, String name, voidObjectAffineSVPintDelegate cb, int key, IntPtr p, int flags); + [DllImport("libgobject-2.0-0.dll")] static extern void g_signal_connect_data(IntPtr obj, String name, voidObjectAffineSVPintDelegate cb, int key, IntPtr p, int flags); public voidObjectAffineSVPintSignal(GLib.Object obj, IntPtr raw, String name, MulticastDelegate eh, Type argstype) : base(obj, eh, argstype) { diff --git a/gnomedb/.cvsignore b/gnomedb/.cvsignore index 515a5df5c..9127335da 100755 --- a/gnomedb/.cvsignore +++ b/gnomedb/.cvsignore @@ -1,5 +1,6 @@ gnomedb-sharp.pc *.dll +*.dll.config generated generated-stamp Makefile diff --git a/gnomedb/Makefile.am b/gnomedb/Makefile.am index a51f24df5..e2b597e79 100644 --- a/gnomedb/Makefile.am +++ b/gnomedb/Makefile.am @@ -1,5 +1,5 @@ if ENABLE_GNOMEDB -TARGET = $(ASSEMBLY) +TARGET = $(ASSEMBLY) $(ASSEMBLY).config APIS = $(API) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnomedb-sharp.pc @@ -21,7 +21,7 @@ assembly_DATA = $(TARGET) gapi_DATA = $(APIS) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) -DISTCLEANFILES = gnomedb-sharp.pc +DISTCLEANFILES = gnomedb-sharp.pc $(ASSEMBLY).config sources = \ Application.cs @@ -34,6 +34,7 @@ build_customs = $(addprefix $(srcdir)/, $(customs)) EXTRA_DIST = \ $(RAW_API) \ + $(ASSEMBLY).config.in \ $(METADATA) \ $(customs) \ $(sources) \ diff --git a/gnomedb/gnomedb-sharp.dll.config.in b/gnomedb/gnomedb-sharp.dll.config.in new file mode 100644 index 000000000..38d6eb598 --- /dev/null +++ b/gnomedb/gnomedb-sharp.dll.config.in @@ -0,0 +1,4 @@ + + + + diff --git a/gtk/.cvsignore b/gtk/.cvsignore index 4562d9438..8b6a98fdd 100755 --- a/gtk/.cvsignore +++ b/gtk/.cvsignore @@ -1,4 +1,5 @@ *.dll +*.dll.config generated generated-stamp Makefile diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 9936cc78c..506ed3f01 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -11,9 +11,10 @@ references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk ASSEMBLY = $(ASSEMBLY_NAME).dll assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(ASSEMBLY) +assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) $(ADDITIONAL_API) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c +DISTCLEANFILES = $(ASSEMBLY).config sources = \ Application.cs \ @@ -81,6 +82,7 @@ build_customs = $(addprefix $(srcdir)/, $(customs)) EXTRA_DIST = \ makefile.win32 \ + $(ASSEMBLY).config.in \ $(RAW_API) \ $(ADDITIONAL_API) \ $(METADATA) \ diff --git a/gtk/gtk-sharp.dll.config.in b/gtk/gtk-sharp.dll.config.in new file mode 100644 index 000000000..ec9d3b93d --- /dev/null +++ b/gtk/gtk-sharp.dll.config.in @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtkhtml/.cvsignore b/gtkhtml/.cvsignore index e0fd20965..5fbb574d2 100755 --- a/gtkhtml/.cvsignore +++ b/gtkhtml/.cvsignore @@ -1,5 +1,6 @@ gtkhtml-sharp.pc *.dll +*.dll.config generated generated-stamp Makefile diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am index 0bc671675..0fc326dba 100644 --- a/gtkhtml/Makefile.am +++ b/gtkhtml/Makefile.am @@ -1,5 +1,5 @@ if ENABLE_GTKHTML -TARGET = $(ASSEMBLY) +TARGET = $(ASSEMBLY) $(ASSEMBLY).config APIS = $(API) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gtkhtml-sharp.pc @@ -21,7 +21,7 @@ assembly_DATA = $(TARGET) gapi_DATA = $(APIS) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) -DISTCLEANFILES = gtkhtml-sharp.pc +DISTCLEANFILES = gtkhtml-sharp.pc $(ASSEMBLY).config sources = @@ -34,6 +34,7 @@ build_customs = $(addprefix $(srcdir)/, $(customs)) EXTRA_DIST = \ $(RAW_API) \ + $(ASSEMBLY).config.in \ $(METADATA) \ $(customs) \ $(sources) \ diff --git a/gtkhtml/gtkhtml-sharp.dll.config.in b/gtkhtml/gtkhtml-sharp.dll.config.in new file mode 100644 index 000000000..e8a285810 --- /dev/null +++ b/gtkhtml/gtkhtml-sharp.dll.config.in @@ -0,0 +1,4 @@ + + + + diff --git a/pango/.cvsignore b/pango/.cvsignore index 4562d9438..8b6a98fdd 100644 --- a/pango/.cvsignore +++ b/pango/.cvsignore @@ -1,4 +1,5 @@ *.dll +*.dll.config generated generated-stamp Makefile diff --git a/pango/Makefile.am b/pango/Makefile.am index 2a0b77f35..69f13b94c 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -7,9 +7,10 @@ references = /r:../glib/glib-sharp.dll ASSEMBLY = $(ASSEMBLY_NAME).dll assemblydir = $(libdir) gapidir = $(datadir)/gapi -assembly_DATA = $(ASSEMBLY) +assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) +DISTCLEANFILES = $(ASSEMBLY).config sources = \ Scale.cs @@ -25,11 +26,12 @@ customs = \ build_customs = $(addprefix $(srcdir)/, $(customs)) dist_customs = $(customs) -EXTRA_DIST = \ - makefile.win32 \ - $(RAW_API) \ - $(METADATA) \ - $(dist_customs) \ +EXTRA_DIST = \ + makefile.win32 \ + $(ASSEMBLY).config.in \ + $(RAW_API) \ + $(METADATA) \ + $(dist_customs) \ $(dist_sources) $(API): $(srcdir)/$(METADATA) $(srcdir)/$(RAW_API) diff --git a/pango/pango-sharp.dll.config.in b/pango/pango-sharp.dll.config.in new file mode 100644 index 000000000..50bd178c4 --- /dev/null +++ b/pango/pango-sharp.dll.config.in @@ -0,0 +1,4 @@ + + + + diff --git a/rsvg/.cvsignore b/rsvg/.cvsignore index 6c8d702fa..30b988721 100755 --- a/rsvg/.cvsignore +++ b/rsvg/.cvsignore @@ -1,5 +1,6 @@ rsvg-sharp.pc *.dll +*.dll.config generated generated-stamp Makefile diff --git a/rsvg/Makefile.am b/rsvg/Makefile.am index 7373f21d9..3c400ddeb 100644 --- a/rsvg/Makefile.am +++ b/rsvg/Makefile.am @@ -1,5 +1,5 @@ if ENABLE_RSVG -TARGET = $(ASSEMBLY) +TARGET = $(ASSEMBLY) $(ASSEMBLY).config APIS = $(API) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = rsvg-sharp.pc @@ -22,7 +22,7 @@ assembly_DATA = $(TARGET) gapi_DATA = $(APIS) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) -DISTCLEANFILES = rsvg-sharp.pc +DISTCLEANFILES = rsvg-sharp.pc $(ASSEMBLY).config sources = \ Tool.cs @@ -35,6 +35,7 @@ build_customs = $(addprefix $(srcdir)/, $(customs)) EXTRA_DIST = \ $(RAW_API) \ + $(ASSEMBLY).config.in \ $(METADATA) \ $(customs) \ $(sources) \ diff --git a/rsvg/rsvg-sharp.dll.config.in b/rsvg/rsvg-sharp.dll.config.in new file mode 100644 index 000000000..0980d3a28 --- /dev/null +++ b/rsvg/rsvg-sharp.dll.config.in @@ -0,0 +1,3 @@ + + + diff --git a/vte/.cvsignore b/vte/.cvsignore index fe7cb4e1c..d9ad68405 100644 --- a/vte/.cvsignore +++ b/vte/.cvsignore @@ -1,5 +1,6 @@ vte-sharp.pc vte-sharp.dll +vte-sharp.dll.config generated generated-stamp Makefile diff --git a/vte/Makefile.am b/vte/Makefile.am index 8b9e10d3a..baca35736 100644 --- a/vte/Makefile.am +++ b/vte/Makefile.am @@ -1,5 +1,5 @@ if ENABLE_VTE -TARGET = $(ASSEMBLY) +TARGET = $(ASSEMBLY) $(ASSEMBLY).config APIS = $(API) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = vte-sharp.pc @@ -21,7 +21,7 @@ assembly_DATA = $(TARGET) gapi_DATA = $(APIS) CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) -DISTCLEANFILES = vte-sharp.pc +DISTCLEANFILES = vte-sharp.pc $(ASSEMBLY).config sources = @@ -33,6 +33,7 @@ build_customs = $(addprefix $(srcdir)/, $(customs)) EXTRA_DIST = \ $(RAW_API) \ + $(ASSEMBLY).config.in \ $(METADATA) \ $(customs) \ $(sources) \ diff --git a/vte/vte-sharp.dll.config.in b/vte/vte-sharp.dll.config.in new file mode 100644 index 000000000..4dbf20f8d --- /dev/null +++ b/vte/vte-sharp.dll.config.in @@ -0,0 +1,6 @@ + + + + + +