Wed Feb 24 15:47:16 CET 2010 Paolo Molaro <[email protected]>

* confiure.in, data/mono-2.pc.in, data/Makefile.am, samples/embed/*: increase the API version. svn path=/trunk/mono/; revision=152356
midnite8177 · Feb 24, 2010 · 9e1f34d · 9e1f34d
2 parents 8c30681 + 05972f1
commit 9e1f34d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+
+Wed Feb 24 15:47:16 CET 2010 Paolo Molaro <[email protected]>
+
+	* confiure.in, data/mono-2.pc.in, data/Makefile.am,
+	samples/embed/*: increase the API version.
+
 2010-02-18  Marek Habersack  <[email protected]>
 
 	* scripts/mono-configuration-crypto.in: added

diff --git a/configure.in b/configure.in
@@ -9,7 +9,7 @@ AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(mono,2.7)
 AM_MAINTAINER_MODE
 
-API_VER=1.0
+API_VER=2.0
 AC_SUBST(API_VER)
 
 AC_PROG_LN_S
@@ -2667,7 +2667,7 @@ data/net_2_0/Makefile
 data/net_4_0/Makefile
 data/net_2_0/Browsers/Makefile
 data/mint.pc
-data/mono.pc
+data/mono-2.pc
 data/mono-cairo.pc
 data/mono-nunit.pc
 data/mono-options.pc

diff --git a/data/Makefile.am b/data/Makefile.am
@@ -9,7 +9,7 @@ monodir = $(sysconfdir)/mono
 EXTRA_DIST =  	\
 	config.in \
 	browscap.ini mono.supp mono.d README ChangeLog \
-	mono.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in monodoc.pc.in \
+	mono-2.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in monodoc.pc.in \
 	mono-nunit.pc.in mono-cairo.pc.in mono-options.pc.in cecil.pc.in \
 	mono-lineeditor.pc.in system.web.extensions_1.0.pc.in system.web.extensions.design_1.0.pc.in\
 	dtrace-prelink.sh mono.web.pc.in system.web.mvc.pc.in \
@@ -21,17 +21,17 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 if JIT_SUPPORTED
 if INTERP_SUPPORTED
-pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
+pkgconfig_DATA= mono-2.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
 		system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc
 else
-pkgconfig_DATA= mono.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
+pkgconfig_DATA= mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
 		system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc
 endif
 else
 pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc
 endif
 
-DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
+DISTCLEANFILES= mono-2.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
 		system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc
 
 mono_DATA =  config \

diff --git a/data/mono.pc.in → data/mono-2.pc.in b/data/mono.pc.in → data/mono-2.pc.in
@@ -8,5 +8,5 @@ Name: Mono
 Description: Mono Runtime
 Version: @VERSION@
 Requires: glib-2.0 gthread-2.0
-Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@
+Libs: -L${libdir} @export_ldflags@ -lmono-@API_VER@ @libmono_ldflags@
 Cflags: -I${includedir} @libmono_cflags@
diff --git a/samples/embed/test-invoke.c b/samples/embed/test-invoke.c
@@ -5,12 +5,13 @@
 #include <mono/metadata/debug-helpers.h>
 #include <string.h>
 #include <stdlib.h>
+#include <glib.h>
 
 /*
  * Simple mono embedding example.
  * We show how to create objects and invoke methods and set fields in them.
  * Compile with: 
- * 	gcc -Wall -o test-invoke test-invoke.c `pkg-config --cflags --libs mono` -lm
+ * 	gcc -Wall -o test-invoke test-invoke.c `pkg-config --cflags --libs mono-2` -lm
  * 	mcs invoke.cs
  * Run with:
  * 	./test-invoke invoke.exe

diff --git a/samples/embed/test-metadata.c b/samples/embed/test-metadata.c
@@ -1,10 +1,11 @@
 #include <mono/jit/jit.h>
+#include <glib.h>
 
 /*
  * Very simple mono embedding example.
  * This sample shows how to access metadata elements from an image.
  * Compile with: 
- * 	gcc -o test-metadata test-metadata.c `pkg-config --cflags --libs mono` -lm
+ * 	gcc -o test-metadata test-metadata.c `pkg-config --cflags --libs mono-2` -lm
  * Run with:
  * 	./test-metadata namespace name
  */

diff --git a/samples/embed/teste.c b/samples/embed/teste.c
@@ -5,7 +5,7 @@
 /*
  * Very simple mono embedding example.
  * Compile with: 
- * 	gcc -o teste teste.c `pkg-config --cflags --libs mono` -lm
+ * 	gcc -o teste teste.c `pkg-config --cflags --libs mono-2` -lm
  * 	mcs test.cs
  * Run with:
  * 	./teste test.exe