From 07f09dd3dad1438ed23e690c89b80bb962e09b69 Mon Sep 17 00:00:00 2001 From: Stephan Sundermann Date: Wed, 19 Mar 2014 15:46:38 +0100 Subject: [PATCH] make: Add generated api to gapidir --- configure.ac | 2 ++ gstreamer-sharp-1.0.pc.in | 2 ++ sources/Makefile.am | 7 +++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 546b116c2e..5a40b0c18e 100644 --- a/configure.ac +++ b/configure.ac @@ -77,7 +77,9 @@ PKG_CHECK_MODULES(GLIB_SHARP, glib-sharp-3.0 >= 2.99.3) AC_SUBST(GLIB_SHARP_CFLAGS) AC_SUBST(GLIB_SHARP_LIBS) gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-3.0` +gapidir=`pkg-config --variable=gapidir gtk-sharp-3.0` AC_SUBST(gtksharp_prefix) +AC_SUBST(gapidir) dnl Find GAPI PKG_CHECK_MODULES(GAPI, gapi-3.0 >= 2.99.3) diff --git a/gstreamer-sharp-1.0.pc.in b/gstreamer-sharp-1.0.pc.in index c2dd575943..86acafac72 100644 --- a/gstreamer-sharp-1.0.pc.in +++ b/gstreamer-sharp-1.0.pc.in @@ -1,9 +1,11 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=@libdir@ +gapidir=@gapidir@ Name: @ASSEMBLY_TITLE@ Description: @ASSEMBLY_DESCRIPTION@ Version: @VERSION@ Requires: +Cflags: -I:${gapidir}/gstreamer-sharp.xml Libs: -r:${libdir}/mono/@ASSEMBLY_NAME@/@ASSEMBLY_NAME@.dll diff --git a/sources/Makefile.am b/sources/Makefile.am index 8b2ef71c82..55c77b6cf2 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -20,7 +20,8 @@ EXTRA_DIST = \ $(sources) \ $(METADATA) \ AssemblyInfo.cs.in \ - $(ASSEMBLY_NAME).snk + $(ASSEMBLY_NAME).snk \ + gstreamer-sharp.xml all: generated-stamp $(ASSEMBLY) @@ -43,10 +44,12 @@ $(DLL): $(build_sources) generated-stamp install-data-local: echo "$(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS) || exit 1; + $(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS) || exit 1; \ + cp $(API) $(gapidir); uninstall-local: echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; + rm -f $(gapidir)/$(API) clean-local: -rm -r generated/*