commit a2fb1c7b384c0ec27821c8a2e4574a9e1f0721da
Author: Jeffrey Stedfast <fejj gnome org>
Date: Wed Jan 11 08:53:49 2012 -0500
Copy gtk-sharp build process over to gmime-sharp
2012-01-11 Jeffrey Stedfast <fejj gnome org>
* mono/Makefile.am: Fixed up to more closely match the gtk-sharp
build.
* mono/gmime-sharp.pc.in: Fixed to more closely match gtk-sharp.
ChangeLog | 7 +++++++
mono/Makefile.am | 42 ++++++++++++++++++++++--------------------
mono/gmime-sharp.pc.in | 8 ++++++--
3 files changed, 35 insertions(+), 22 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3aba074..6ad216e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2012-01-11 Jeffrey Stedfast <fejj gnome org>
+ * mono/Makefile.am: Fixed up to more closely match the gtk-sharp
+ build.
+
+ * mono/gmime-sharp.pc.in: Fixed to more closely match gtk-sharp.
+
+2012-01-11 Jeffrey Stedfast <fejj gnome org>
+
* gmime/gmime-pkcs7-context.c: Fixed some switch statements to
include a 'default' code path, fixing some compiler
warnings. Fixes bug #667684.
diff --git a/mono/Makefile.am b/mono/Makefile.am
index 6225b4c..49d7021 100644
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -1,4 +1,5 @@
API = gmime-api.xml
+SNK = gmime-sharp.snk
RAW_API = gmime-api.raw
METADATA = GMime.metadata
ASSEMBLY_NAME = gmime-sharp
@@ -6,14 +7,18 @@ references = $(GLIB_SHARP_LIBS)
SOURCES_XML = sources.xml
PACKAGE_SHARP = $(PACKAGE)-sharp-$(GMIME_API_VERSION)
-TARGET = $(ASSEMBLY)
ASSEMBLY = $(ASSEMBLY_NAME).dll
+TARGET = $(ASSEMBLY) $(ASSEMBLY).config
+TARGET_API = $(API)
noinst_DATA = $(API) $(ASSEMBLY) $(ASSEMBLY).config
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API)
DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs gmime-sharp-$(GMIME_API_VERSION).pc
+GACUTIL_FLAGS = -package $(PACKAGE_VERSION) -gacdir $(DESTDIR)$(prefix)/lib
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(PACKAGE_SHARP).pc
+gapidir = $(datadir)/gapi-2.0
+gapi_DATA = $(TARGET_API)
sources = \
StreamWrapper.cs \
@@ -54,8 +59,8 @@ build_customs = \
EXTRA_DIST = \
$(ASSEMBLY).config.in \
- $(ASSEMBLY_NAME).snk \
AssemblyInfo.cs.in \
+ $(SNK) \
$(METADATA) \
$(RAW_API) \
$(customs) \
@@ -76,31 +81,28 @@ generated-stamp: $(API) $(build_customs)
$(GAPI_CODEGEN) --generate $(API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
&& touch generated-stamp
+if PLATFORM_WIN32
+GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
+else
+GAPI_CDECL_INSERT=
+endif
+
$(ASSEMBLY): $(build_sources) generated-stamp $(srcdir)/$(ASSEMBLY_NAME).snk
$(CSC) -unsafe /out:$(ASSEMBLY) /target:library $(references) \
-keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk $(build_sources) generated/*.cs
- sn -q -R $(ASSEMBLY) $(srcdir)/$(ASSEMBLY_NAME).snk
+ $(GAPI_CDECL_INSERT)
+ sn -q -R $(ASSEMBLY) $(srcdir)/$(SNK)
-install-data-hook:
- @if test -n '$(TARGET)'; then \
- if test -n '$(DESTDIR)'; then \
- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)"; \
- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1; \
- else \
- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir)"; \
- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1; \
- fi; \
+install-data-local:
+ @if test -n '$(TARGET)'; then \
+ echo "$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS)" \
+ $(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS) || exit 1; \
fi
uninstall-local:
- @if test -n '$(TARGET)'; then \
- if test -n '$(DESTDIR)'; then \
- echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)"; \
- $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1; \
- else \
- echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir)"; \
- $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1; \
- fi; \
+ @if test -n '$(TARGET)'; then \
+ echo "$(GACUTIL) -u $(ASSEMBLY) $(GACUTIL_FLAGS)" \
+ $(GACUTIL) -u $(ASSEMBLY) $(GACUTIL_FLAGS) || exit 1; \
fi
parse:
diff --git a/mono/gmime-sharp.pc.in b/mono/gmime-sharp.pc.in
index 353a00d..ca9fc1c 100644
--- a/mono/gmime-sharp.pc.in
+++ b/mono/gmime-sharp.pc.in
@@ -1,7 +1,11 @@
-exec_prefix= prefix@
-libdir= libdir@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+gapidir=${prefix}/share/gapi-2.0
Name: gmime-sharp
Version: @VERSION@
Description: .NET bindings for GMime
+Cflags: -I:${gapidir}/gmime-api.xml
Libs: -r:${libdir}/mono/gmime-sharp- GMIME_API_VERSION@/gmime-sharp.dll
+Requires: glib-sharp-2.0