Merge branch 'master' into gtk3

diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am
index ef18a90a12d74e051ba8bf7aef22696698600257..81c5bc7aec27e371752f666a958b12e63cb0c43e 100644 (file)
--- 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)"\" \