X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2FMakefile.am;h=8f7c216754655768c88487ad7662f7fb794bdc79;hb=44de8692debacd87df92aa04f88941336a894ce3;hp=96d861d7e6ad7909527dba071c3fe32519d64f98;hpb=c9cb272c77ce3db3764a315480cfac2dc1b70e20;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am
index 96d861d..8f7c216 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 \
@@ -45,7 +39,7 @@ libchimara_la_SOURCES = \
 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)
@@ -95,10 +89,10 @@ Chimara_1_0_gir_SCANNERFLAGS = \
 Chimara_1_0_gir_EXPORT_PACKAGES = chimara
 INTROSPECTION_GIRS += Chimara-1.0.gir
 
-girdir = $(datadir)/gir-1.0
+girdir = @INTROSPECTION_GIRDIR@
 gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibdir = $(libdir)/girepository-1.0
+typelibdir = @INTROSPECTION_TYPELIBDIR@
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
@@ -110,7 +104,7 @@ dist_vapi_DATA = chimara.vapi
 
 if BUILDING_VAPI
 chimara.vapi: $(INTROSPECTION_GIRS)
-	$(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-2.0 Chimara-1.0.gir && \
+	$(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-3.0 Chimara-1.0.gir && \
 	touch $@
 endif