X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2FMakefile.am;h=efb023dde1e030c7588c5903daa76043876f3f66;hb=044af5b603b590e5cbc9e916786d6c3fb835b38e;hp=f1ef3f4a35bef37afc962277b89adefa391d0826;hpb=5fb1676e99c4f4bd13e9392bd346c87595dd13b4;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am
index f1ef3f4..efb023d 100644
--- a/libchimara/Makefile.am
+++ b/libchimara/Makefile.am
@@ -4,12 +4,6 @@ AM_CFLAGS = -Wall
 
 lib_LTLIBRARIES = libchimara.la
 
-if TARGET_ILIAD
-pluginpath = "../interpreters"
-else
-pluginpath = $(pkglibdir)
-endif
-
 libchimara_la_SOURCES = \
 	abort.c abort.h \
 	case.c \
@@ -42,10 +36,10 @@ libchimara_la_SOURCES = \
 	style.c style.h \
 	timer.c timer.h \
 	window.c window.h
-libchimara_la_CPPFLAGS = \
+libchimara_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DG_LOG_DOMAIN=\"Chimara\" \
 	-DLOCALEDIR=\""$(datadir)/locale"\" \
-	-DPLUGINDIR=\""$(pluginpath)"\" \
+	-DPLUGINDIR=\""$(pkglibdir)"\" \
 	-DPLUGINSOURCEDIR=\""$(abs_builddir)/../interpreters"\" \
 	-I$(top_srcdir)
 libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ $(AM_CFLAGS)
@@ -84,7 +78,7 @@ introspection_sources = \
 	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)
@@ -103,10 +97,16 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 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
 
+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