ayatana-commits team mailing list archive

[Ken VanDine <ken.vandine@xxxxxxxxxxxxx>]

Ken VanDine has proposed merging lp:~ken-vandine/libindicate/vapi_fixes into lp:libindicate.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~ken-vandine/libindicate/vapi_fixes/+merge/58142

Make sure Indicate-0.5.metadata is in the builddir when generating vapi

-- 
https://code.launchpad.net/~ken-vandine/libindicate/vapi_fixes/+merge/58142
Your team ayatana-commits is subscribed to branch lp:libindicate.

=== renamed file 'libindicate/Indicate-0.5.metadata' => 'libindicate/Indicate-0.5.metadata.in'
--- libindicate/Indicate-0.5.metadata	2011-04-15 21:21:33 +0000
+++ libindicate/Indicate-0.5.metadata.in	2011-04-18 15:29:30 +0000
@@ -1,1 +1,1 @@
-Indicate cheader_filename = "listener.h"
+Indicate cheader_filename = "libindicate/listener.h"

=== modified file 'libindicate/Makefile.am'
--- libindicate/Makefile.am	2011-04-15 21:21:33 +0000
+++ libindicate/Makefile.am	2011-04-18 15:29:30 +0000
@@ -31,7 +31,8 @@
 
 EXTRA_DIST += \
 	$(DBUS_SPECS) \
-	indicate-0.5.pc.in
+	indicate-0.5.pc.in \
+	Indicate-0.5.metadata.in
 
 lib_LTLIBRARIES = \
 	libindicate.la
@@ -113,7 +114,7 @@
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = \
-        --add-include-path=$(srcdir) \
+        --add-include-path=$(top_srcdir) \
         --add-include-path=$(top_srcdir)/libindicate \
         $(introspection_sources) \
         --symbol-prefix=indicate \
@@ -140,6 +141,12 @@
 
 INTROSPECTION_GIRS += Indicate-0.5.gir
 
+Indicate-0.5.metadata: Indicate-0.5.gir
+	cp -f $(top_srcdir)/libindicate/$@.in $@
+
+BUILT_SOURCES += Indicate-0.5.metadata
+CLEANFILES += Indicate-0.5.metadata
+
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)