From: Philip Chimento <philip.chimento@gmail.com>
Date: Sun, 26 Aug 2012 00:21:36 +0000 (+0200)
Subject: Merge branch 'master' into gtk3
X-Git-Tag: v0.9~15
X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=dc9213af8972055ee54bdee4cced6103e1432010;hp=65e1d2c57a697ba303bb7949fac5652a02450399

Merge branch 'master' into gtk3
---

diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am
index ef18a90..81c5bc7 100644
--- a/libchimara/Makefile.am
+++ b/libchimara/Makefile.am
@@ -42,7 +42,7 @@ 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)"\" \