From 53a1f74f649dfe6029e5807c48fefea0f01eaa3a Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Fri, 30 May 2014 10:26:54 +0200
Subject: [PATCH] Cleanup goo/Makefile.am

https://bugs.freedesktop.org/show_bug.cgi?id=79411
---
 goo/Makefile.am | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/goo/Makefile.am b/goo/Makefile.am
index a48b20e..370e850 100644
--- a/goo/Makefile.am
+++ b/goo/Makefile.am
@@ -24,6 +24,24 @@ poppler_goo_include_HEADERS =			\
 
 endif
 
+libgoo_la_SOURCES =				\
+	gfile.cc				\
+	gmempp.cc				\
+	GooHash.cc				\
+	GooList.cc				\
+	GooTimer.cc				\
+	GooString.cc				\
+	gmem.cc					\
+	FixedPoint.cc				\
+	NetPBMWriter.cc				\
+	PNGWriter.cc				\
+	JpegWriter.cc				\
+	TiffWriter.cc				\
+	ImgWriter.cc				\
+	gtypes_p.h				\
+	gstrtod.cc				\
+	grandom.cc
+
 if BUILD_LIBJPEG
 libjpeg_includes = $(LIBJPEG_CFLAGS)
 endif
@@ -40,27 +58,9 @@ if BUILD_LIBPNG
 libpng_includes = $(LIBPNG_CFLAGS)
 endif
 
-INCLUDES =					\
+libgoo_la_CPPFLAGS =				\
 	-I$(top_srcdir)				\
 	$(libjpeg_includes)                     \
 	$(libtiff_includes)                     \
 	$(libjpeg2000_includes)                 \
 	$(libpng_includes)
-
-libgoo_la_SOURCES =				\
-	gfile.cc				\
-	gmempp.cc				\
-	GooHash.cc				\
-	GooList.cc				\
-	GooTimer.cc				\
-	GooString.cc				\
-	gmem.cc					\
-	FixedPoint.cc				\
-	NetPBMWriter.cc				\
-	PNGWriter.cc				\
-	JpegWriter.cc				\
-	TiffWriter.cc				\
-	ImgWriter.cc				\
-	gtypes_p.h				\
-	gstrtod.cc				\
-	grandom.cc
-- 
1.8.3.2