From 8bbcc57f48ce10ce049d007cfd44425297f86e1c Mon Sep 17 00:00:00 2001 From: Michael Ploujnikov Date: Sat, 30 Aug 2008 11:49:31 -0400 Subject: [PATCH] set per-target CPPFLAGS for lumigui instead of global AM_CPPFLAGS this prevents strange (_CPPFLAGS) dependencies such as the one that was identified and fixed in admin/Makefile.am Also, make sure to include the global $(AM_CPPFLAGS) flags in the per-target ones --- admin/Makefile.am | 2 +- src/gui/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/Makefile.am b/admin/Makefile.am index 9eb4fbb89..643ef3ac0 100644 --- a/admin/Makefile.am +++ b/admin/Makefile.am @@ -24,5 +24,5 @@ vgsuppression_LDADD = liblumi.a -lnobugmt -lpthread -ldl noinst_PROGRAMS += rsvg-convert rsvg_convert_SOURCES = $(admin_srcdir)/rsvg-convert.c -rsvg_convert_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror +rsvg_convert_CPPFLAGS = $(GTK_LUMIERA_CFLAGS) $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror rsvg_convert_LDADD = -lcairo -lglib-2.0 -lgthread-2.0 -lrsvg-2 diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 3508b9fe8..0e1726956 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -21,7 +21,7 @@ lumigui_srcdir = $(top_srcdir)/src/gui #lumigui_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror #lumigui_CPPFLAGS = -I$(top_srcdir)/src/ -AM_CPPFLAGS = \ +lumigui_CPPFLAGS = $(AM_CPPFLAGS) \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \