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/57959

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

=== added file 'libindicate/Indicate-0.5.metadata'
--- libindicate/Indicate-0.5.metadata	1970-01-01 00:00:00 +0000
+++ libindicate/Indicate-0.5.metadata	2011-04-15 21:32:28 +0000
@@ -0,0 +1,1 @@
+Indicate cheader_filename = "listener.h"

=== modified file 'libindicate/Makefile.am'
--- libindicate/Makefile.am	2011-02-11 18:17:33 +0000
+++ libindicate/Makefile.am	2011-04-15 21:32:28 +0000
@@ -130,9 +130,13 @@
         GObject-2.0 \
         GLib-2.0 \
         Dbusmenu-0.4
-Indicate_0_5_gir_CFLAGS = $(LIBINDICATE_CFLAGS) -I$(srcdir)
+Indicate_0_5_gir_CFLAGS = $(LIBINDICATE_CFLAGS) -I$(top_srcdir)
 Indicate_0_5_gir_LIBS = libindicate.la
 Indicate_0_5_gir_FILES = $(introspection_sources)
+Indicate_0_5_gir_NAMESPACE = Indicate
+Indicate_0_5_gir_VERSION = 0.5
+Indicate_0_5_gir_EXPORT_PACKAGES = indicate-0.5
+Indicate_0_5_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
 
 INTROSPECTION_GIRS += Indicate-0.5.gir
 
@@ -155,12 +159,10 @@
 vapidir = $(datadir)/vala/vapi
 vapi_DATA = Indicate-0.5.vapi
 
-Indicate-0.5.vapi: Indicate-0.5.gir Makefile.am
+Indicate-0.5.vapi: Indicate-0.5.gir
 	$(VALA_API_GEN) --library=Indicate-0.5 \
-		--pkg glib-2.0 \
-		--pkg Dbusmenu-0.4 \
-		--vapidir=$(top_builddir)/src \
-		$<
+			--pkg Dbusmenu-0.4 \
+			$<
 
 CLEANFILES += $(vapi_DATA)