From bf225c5c81770f16a430f0970aede33c10f08ba7 Mon Sep 17 00:00:00 2001 From: Mark Probst Date: Wed, 19 Jan 2011 22:24:31 +0100 Subject: [build] pkg-config support for libmonosgen. --- configure.in | 1 + data/Makefile.am | 14 ++++++++++---- data/monosgen-2.pc.in | 11 +++++++++++ mono-core.spec.in | 1 + mono/metadata/Makefile.am | 1 + 5 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 data/monosgen-2.pc.in diff --git a/configure.in b/configure.in index ac9717d2a31..d56379b1752 100644 --- a/configure.in +++ b/configure.in @@ -2876,6 +2876,7 @@ data/net_4_0/Makefile data/net_2_0/Browsers/Makefile data/mint.pc data/mono-2.pc +data/monosgen-2.pc data/mono.pc data/mono-cairo.pc data/mono-nunit.pc diff --git a/data/Makefile.am b/data/Makefile.am index 14ef47b9d9a..97e713feb98 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 mono-2.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in monodoc.pc.in \ + mono.pc.in mono-2.pc.in monosgen-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 system.web.mvc2.pc.in \ @@ -19,20 +19,26 @@ EXTRA_DIST = \ pkgconfigdir = $(libdir)/pkgconfig +if SUPPORT_SGEN +SGENPCFILE=monosgen-2.pc +else +SGENPCFILE= +endif + if JIT_SUPPORTED if INTERP_SUPPORTED pkgconfig_DATA= mono.pc 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 system.web.mvc2.pc + system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc $(SGENPCFILE) else pkgconfig_DATA= mono.pc 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 system.web.mvc2.pc + system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc $(SGENPCFILE) 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-2.pc 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 \ - system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc + system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc $(SGENPCFILE) mono_DATA = config \ browscap.ini diff --git a/data/monosgen-2.pc.in b/data/monosgen-2.pc.in new file mode 100644 index 00000000000..a6ba571b7e4 --- /dev/null +++ b/data/monosgen-2.pc.in @@ -0,0 +1,11 @@ +prefix=${pcfiledir}/../.. +exec_prefix=${pcfiledir}/../.. +libdir=${prefix}/@reloc_libdir@ +includedir=${prefix}/include/mono-@API_VER@ +sysconfdir=@sysconfdir@ + +Name: Mono +Description: Mono Runtime +Version: @VERSION@ +Libs: -L${libdir} @export_ldflags@ -lmonosgen-@API_VER@ @libmono_ldflags@ +Cflags: -I${includedir} @libmono_cflags@ diff --git a/mono-core.spec.in b/mono-core.spec.in index 77716f5a682..7ac368ab9d5 100644 --- a/mono-core.spec.in +++ b/mono-core.spec.in @@ -350,6 +350,7 @@ A Library for embedding Mono in your Application (sgen version). %files -n libmonosgen-2_0-0 %defattr(-, root, root) %_libdir/libmonosgen-2.0.so.0* +%_libdir/pkgconfig/monosgen-2.pc %post -n libmonosgen-2_0-0 -p /sbin/ldconfig diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am index a8d323ed56a..83c50ca98f9 100644 --- a/mono/metadata/Makefile.am +++ b/mono/metadata/Makefile.am @@ -255,6 +255,7 @@ libmonoruntimeinclude_HEADERS = \ mono-config.h \ mono-debug.h \ mono-gc.h \ + sgen-bridge.h \ object.h \ opcodes.h \ profiler.h \ -- cgit v1.2.3