From 55b595bfb88914aef5b5dc306ada2f0c4eeda15f Mon Sep 17 00:00:00 2001 From: Evan Nemerson Date: Mon, 18 Jun 2012 13:58:40 -0700 Subject: [PATCH 2/4] Fix Vala binding generation for colord-gtk --- libcolord-gtk/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libcolord-gtk/Makefile.am b/libcolord-gtk/Makefile.am index 1faa50e..b631f48 100644 --- a/libcolord-gtk/Makefile.am +++ b/libcolord-gtk/Makefile.am @@ -85,7 +85,7 @@ ColordGtk-1.0.gir: libcolord-gtk.la ColordGtk_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-3.0 Colord-1.0 ColordGtk_1_0_gir_CFLAGS = $(INCLUDES) ColordGtk_1_0_gir_SCANNERFLAGS = --identifier-prefix=Cd \ - --symbol-prefix=cd_ \ + --symbol-prefix=cd \ --warn-all \ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/libcolord \ @@ -103,13 +103,15 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelib_DATA) -if FALSE if HAVE_VAPIGEN colord-gtk.vapi: ColordGtk-1.0.gir $(MAKE) $(AM_MAKEFLAGS) ColordGtk-1.0.gir $(AM_V_GEN)$(VAPIGEN) $(VAPIGENFLAGS) \ --library colord-gtk \ + --vapidir $(top_builddir)/libcolord \ --pkg gio-2.0 \ + --pkg gtk+-3.0 \ + --pkg colord \ ColordGtk-1.0.gir touch $@ vapidir = $(datadir)/vala/vapi @@ -117,7 +119,6 @@ dist_vapi_DATA = \ colord-gtk.vapi CLEANFILES += $(dist_vapi_DATA) endif -endif endif -- 1.7.10.2