projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Signal handler autoconnect now works in player.py
[projects/chimara/chimara.git]
/
libchimara
/
Makefile.am
diff --git
a/libchimara/Makefile.am
b/libchimara/Makefile.am
index f1ef3f4a35bef37afc962277b89adefa391d0826..ef18a90a12d74e051ba8bf7aef22696698600257 100644
(file)
--- a/
libchimara/Makefile.am
+++ b/
libchimara/Makefile.am
@@
-84,7
+84,7
@@
introspection_sources = \
chimara-if.c chimara-if.h
Chimara-1.0.gir: libchimara.la
chimara-if.c chimara-if.h
Chimara-1.0.gir: libchimara.la
-Chimara_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-
2
.0
+Chimara_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-
3
.0
Chimara_1_0_gir_CFLAGS = @CHIMARA_CFLAGS@ -I$(top_srcdir)
Chimara_1_0_gir_LIBS = libchimara.la
Chimara_1_0_gir_FILES = $(introspection_sources)
Chimara_1_0_gir_CFLAGS = @CHIMARA_CFLAGS@ -I$(top_srcdir)
Chimara_1_0_gir_LIBS = libchimara.la
Chimara_1_0_gir_FILES = $(introspection_sources)
@@
-103,10
+103,16
@@
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif
-
-# Currently, install the Vala VAPI file statically - generation is broken?
+GITIGNOREFILES = Chimara-1.0.gir Chimara-1.0.typelib
vapidir = $(datadir)/vala/vapi
dist_vapi_DATA = chimara.vapi
vapidir = $(datadir)/vala/vapi
dist_vapi_DATA = chimara.vapi
+if BUILDING_VAPI
+chimara.vapi: $(INTROSPECTION_GIRS)
+ $(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-3.0 Chimara-1.0.gir && \
+ touch $@
+endif
+
+MAINTAINERCLEANFILES = chimara.vapi
-include $(top_srcdir)/git.mk
-include $(top_srcdir)/git.mk