From e65657f2a65bcbe3772b7a5fa845d9a07969d944 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Fri, 6 Jun 2014 21:02:29 +0200
Subject: [PATCH] Replace INCLUDES with target_CPPFLAGS in poppler/Makefile.am

https://bugs.freedesktop.org/show_bug.cgi?id=79411
---
 poppler/Makefile.am | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index ce6f4b2..f5ccb7e 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -1,3 +1,7 @@
+AM_CPPFLAGS =					\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/goo
+
 if BUILD_SPLASH_OUTPUT
 
 splash_sources =				\
@@ -33,6 +37,10 @@ libpoppler_cairo_la_SOURCES =			\
 	CairoRescaleBox.cc			\
 	CairoRescaleBox.h
 
+libpoppler_cairo_la_CPPFLAGS =			\
+	$(cairo_includes)			\
+	$(AM_CPPFLAGS)
+
 endif
 
 if BUILD_LIBJPEG
@@ -120,20 +128,6 @@ cms_includes = $(LCMS_CFLAGS)
 cms_libs = $(LCMS_LIBS)
 endif
 
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/goo			\
-	$(cms_includes)				\
-	$(splash_includes)			\
-	$(cairo_includes)			\
-	$(libjpeg_includes)			\
-	$(libtiff_includes)			\
-	$(libjpeg2000_includes)			\
-	$(libpng_includes)			\
-	$(libcurl_includes)			\
-	$(FREETYPE_CFLAGS)			\
-	$(FONTCONFIG_CFLAGS)
-
 lib_LTLIBRARIES = libpoppler.la
 
 noinst_LTLIBRARIES = $(poppler_cairo)
@@ -314,6 +308,18 @@ libpoppler_la_SOURCES =		\
 	Sound.cc		\
 	XpdfPluginAPI.cc
 
+libpoppler_la_CPPFLAGS =			\
+	$(cms_includes)				\
+	$(splash_includes)			\
+	$(libjpeg_includes)			\
+	$(libtiff_includes)			\
+	$(libjpeg2000_includes)			\
+	$(libpng_includes)			\
+	$(libcurl_includes)			\
+	$(FREETYPE_CFLAGS)			\
+	$(FONTCONFIG_CFLAGS)			\
+	$(AM_CPPFLAGS)
+
 EXTRA_DIST = gen-unicode-tables.py	\
              GlobalParamsWin.cc         \
              PageLabelInfo_p.h
-- 
1.8.3.2