From 859437794ea7bb8039054950c5e1d57de8b5fe16 Mon Sep 17 00:00:00 2001
From: Michael Ploujnikov <ploujj@gmail.com>
Date: Sat, 30 Aug 2008 13:32:24 -0400
Subject: [PATCH] put global AM_CPPFLAGS at the front of the per-target
 variables for consistency

---
 Makefile.am       | 2 ++
 admin/Makefile.am | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 27b972d68..da413d117 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,8 @@ BUILT_SOURCES =
 EXTRA_DIST =
 SUBDIRS =
 
+# global pre-processor flags. Per-target variables should include
+# these at the front (if possible) for consistency
 AM_CPPFLAGS = -I$(top_srcdir)/src/ \
 	$(NOBUGMT_LUMIERA_CFLAGS)
 
diff --git a/admin/Makefile.am b/admin/Makefile.am
index ab0be86fa..f2c9c0636 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -24,5 +24,5 @@ vgsuppression_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl
 
 noinst_PROGRAMS += rsvg-convert
 rsvg_convert_SOURCES = $(admin_srcdir)/rsvg-convert.c
-rsvg_convert_CPPFLAGS = $(GTK_LUMIERA_CFLAGS) $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
+rsvg_convert_CPPFLAGS = $(AM_CPPFLAGS) $(GTK_LUMIERA_CFLAGS) -std=gnu99 -Wall -Werror
 rsvg_convert_LDADD = -lcairo -lglib-2.0 -lgthread-2.0 -lrsvg-2