git: Line endings of README.txt

[projects/chimara/chimara.git] / libchimara / Makefile.am

diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am
index e823694e3fccf135addf1825511de42a9e99bd09..9c2ecf3be973aa48c608a93a86739e76c566e611 100644 (file)
--- 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)
@@ -109,8 +103,9 @@ vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = chimara.vapi
 
 if BUILDING_VAPI
-chimara.vapi: Chimara-1.0.gir
-       $(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-2.0 Chimara-1.0.gir
+chimara.vapi: $(INTROSPECTION_GIRS)
+       $(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-2.0 Chimara-1.0.gir && \
+       touch $@
 endif
 
 MAINTAINERCLEANFILES = chimara.vapi