From: Paolo Molaro Date: Wed, 24 Feb 2010 15:19:21 +0000 (-0000) Subject: Wed Feb 24 15:47:16 CET 2010 Paolo Molaro X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=9e1f34dd2d7be45b2a3a6b1c133a4a1de8c3d864;hp=8c30681105db63b4695f2c2b3e31ec3d694cf973;p=mono.git Wed Feb 24 15:47:16 CET 2010 Paolo Molaro * confiure.in, data/mono-2.pc.in, data/Makefile.am, samples/embed/*: increase the API version. svn path=/trunk/mono/; revision=152356 --- diff --git a/ChangeLog b/ChangeLog index cbda7dcc71f..0c849e6f531 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ + +Wed Feb 24 15:47:16 CET 2010 Paolo Molaro + + * confiure.in, data/mono-2.pc.in, data/Makefile.am, + samples/embed/*: increase the API version. + 2010-02-18 Marek Habersack * scripts/mono-configuration-crypto.in: added diff --git a/configure.in b/configure.in index dfa5f4b7343..5e34f9d203c 100644 --- 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 index bf0a9fb3c87..3ae35a43747 100644 --- 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-2.pc.in b/data/mono-2.pc.in new file mode 100644 index 00000000000..c8d232b0a9b --- /dev/null +++ b/data/mono-2.pc.in @@ -0,0 +1,12 @@ +prefix=${pcfiledir}/../.. +exec_prefix=${pcfiledir}/../.. +libdir=${prefix}/@reloc_libdir@ +includedir=${prefix}/include/mono-@API_VER@ +sysconfdir=@sysconfdir@ + +Name: Mono +Description: Mono Runtime +Version: @VERSION@ +Requires: glib-2.0 gthread-2.0 +Libs: -L${libdir} @export_ldflags@ -lmono-@API_VER@ @libmono_ldflags@ +Cflags: -I${includedir} @libmono_cflags@ diff --git a/data/mono.pc.in b/data/mono.pc.in deleted file mode 100644 index 6da0960db2d..00000000000 --- a/data/mono.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=${pcfiledir}/../.. -exec_prefix=${pcfiledir}/../.. -libdir=${prefix}/@reloc_libdir@ -includedir=${prefix}/include/mono-@API_VER@ -sysconfdir=@sysconfdir@ - -Name: Mono -Description: Mono Runtime -Version: @VERSION@ -Requires: glib-2.0 gthread-2.0 -Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@ -Cflags: -I${includedir} @libmono_cflags@ diff --git a/samples/embed/test-invoke.c b/samples/embed/test-invoke.c index a1c5cd7da05..8779ce3860e 100644 --- a/samples/embed/test-invoke.c +++ b/samples/embed/test-invoke.c @@ -5,12 +5,13 @@ #include #include #include +#include /* * 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 index 689a30d55ac..bcf3041696e 100644 --- a/samples/embed/test-metadata.c +++ b/samples/embed/test-metadata.c @@ -1,10 +1,11 @@ #include +#include /* * 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 index 258d8aa5fa8..2183ccbb50b 100644 --- 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