From 04a642f070a68c466d3cc68774e44d24c3d0070f Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Fri, 11 Jan 2008 19:41:51 +0000 Subject: [PATCH] 2008-01-11 Mike Kestner * bootstrap-2.12: update version to 2.11.90. * configure.in.in: incorporate build service patch. * glib/glib-sharp-2.0.pc.in: add cflags for new api.xml. * glib/Makefile.am: install api.xml to correct dir. svn path=/trunk/gtk-sharp/; revision=92686 --- ChangeLog | 7 +++++++ bootstrap-2.12 | 2 +- configure.in.in | 2 +- glib/Makefile.am | 2 +- glib/glib-sharp-2.0.pc.in | 4 +++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4daad3cd3..22d2bcb93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-11 Mike Kestner + + * bootstrap-2.12: update version to 2.11.90. + * configure.in.in: incorporate build service patch. + * glib/glib-sharp-2.0.pc.in: add cflags for new api.xml. + * glib/Makefile.am: install api.xml to correct dir. + 2008-01-07 Mike Kestner * generator/SymbolTable.cs: map "unsigned long" to LPUGen. diff --git a/bootstrap-2.12 b/bootstrap-2.12 index 7f7c2ae98..fe1b42354 100755 --- a/bootstrap-2.12 +++ b/bootstrap-2.12 @@ -1,7 +1,7 @@ #!/bin/sh # Run this to set configure.in up for an API version. -GTK_SHARP_VERSION=2.11.0 +GTK_SHARP_VERSION=2.11.90 ASSEMBLY_VERSION=2.12.0.0 POLICY_VERSIONS="2.4 2.6 2.8 2.10" GTK_REQUIRED_VERSION=2.12.0 diff --git a/configure.in.in b/configure.in.in index 33a3d28a0..2412783ef 100644 --- a/configure.in.in +++ b/configure.in.in @@ -67,7 +67,7 @@ fi # not 64 bit clean in cross-compile AC_CHECK_SIZEOF(void *, 4) -CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings' +CFLAGS="-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings" if test "x$enable_maintainer_mode" = "xyes"; then DEBUG_FLAGS='-debug' diff --git a/glib/Makefile.am b/glib/Makefile.am index 7eb096781..4239cba73 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -6,7 +6,7 @@ ASSEMBLY_NAME = glib-sharp noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config $(POLICY_ASSEMBLIES) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = glib-sharp-2.0.pc -gapidir = $(libdir)/pkgconfig +gapidir = $(datadir)/gapi-2.0 gapi_DATA = glib-api.xml CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk AssemblyInfo.cs $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS) diff --git a/glib/glib-sharp-2.0.pc.in b/glib/glib-sharp-2.0.pc.in index e4378e0f9..f54b72403 100644 --- a/glib/glib-sharp-2.0.pc.in +++ b/glib/glib-sharp-2.0.pc.in @@ -1,10 +1,12 @@ prefix=${pcfiledir}/../.. exec_prefix=${prefix} libdir=${exec_prefix}/lib +gapidir=${prefix}/share/gapi-2.0 Name: GLib# Description: GLib# - .NET Binding for the glib library. Version: @VERSION@ -Cflags: +Cflags: -I:${gapidir}/glib-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glib-sharp.dll +