From eaa5e1b151bc383167a61f4700417e2941440776 Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Fri, 30 May 2014 10:44:32 +0200 Subject: [PATCH] Cleanup splash/Makefile.am https://bugs.freedesktop.org/show_bug.cgi?id=79411 --- splash/Makefile.am | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/splash/Makefile.am b/splash/Makefile.am index 4330c53..5c265d6 100644 --- a/splash/Makefile.am +++ b/splash/Makefile.am @@ -1,24 +1,3 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/goo \ - $(libjpeg_includes) \ - $(libtiff_includes) \ - $(libpng_includes) \ - $(FREETYPE_CFLAGS) - -# SplashBitmap includes JpegWriter.h, TiffWriter.h, PNGWriter.h -if BUILD_LIBJPEG -libjpeg_includes = $(LIBJPEG_CFLAGS) -endif - -if BUILD_LIBTIFF -libtiff_includes = $(LIBTIFF_CFLAGS) -endif - -if BUILD_LIBPNG -libpng_includes = $(LIBPNG_CFLAGS) -endif - noinst_LTLIBRARIES = libsplash.la if ENABLE_XPDF_HEADERS @@ -71,3 +50,24 @@ libsplash_la_SOURCES = \ SplashT1FontFile.cc \ SplashXPath.cc \ SplashXPathScanner.cc + +# SplashBitmap includes JpegWriter.h, TiffWriter.h, PNGWriter.h +if BUILD_LIBJPEG +libjpeg_includes = $(LIBJPEG_CFLAGS) +endif + +if BUILD_LIBTIFF +libtiff_includes = $(LIBTIFF_CFLAGS) +endif + +if BUILD_LIBPNG +libpng_includes = $(LIBPNG_CFLAGS) +endif + +libsplash_la_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/goo \ + $(libjpeg_includes) \ + $(libtiff_includes) \ + $(libpng_includes) \ + $(FREETYPE_CFLAGS) -- 1.8.3.2