summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Nemerson <evan@coeus-group.com>2012-06-18 13:58:40 -0700
committerRichard Hughes <richard@hughsie.com>2012-06-26 12:13:41 +0100
commit95363ed43729ac5fed091dd1573036bfcb7cfb99 (patch)
tree8fd6b642bb55f81896199bb265a8e9167de43c5b
parent1ec837d31649675ee682f6d6b09a1999b270bb54 (diff)
downloadcolord-gtk-95363ed43729ac5fed091dd1573036bfcb7cfb99.tar.gz
Fix Vala binding generation for colord-gtk
Signed-off-by: Richard Hughes <richard@hughsie.com>
-rw-r--r--libcolord-gtk/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/libcolord-gtk/Makefile.am b/libcolord-gtk/Makefile.am
index 49ff89f..537a136 100644
--- a/libcolord-gtk/Makefile.am
+++ b/libcolord-gtk/Makefile.am
@@ -88,7 +88,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 \
@@ -106,13 +106,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
@@ -120,7 +122,6 @@ dist_vapi_DATA = \
colord-gtk.vapi
CLEANFILES += $(dist_vapi_DATA)
endif
-endif
endif