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=-c

Merge branch 'master' into gtk3
---

dc9213af8972055ee54bdee4cced6103e1432010
diff --combined libchimara/Makefile.am
index ef18a90,96d861d..81c5bc7
--- a/libchimara/Makefile.am
+++ b/libchimara/Makefile.am
@@@ -42,7 -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)"\" \
@@@ -84,7 -84,7 +84,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)
@@@ -110,7 -110,7 +110,7 @@@ dist_vapi_DATA = chimara.vap
  
  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