Attachment 100551 Details for Bug 79411 – Cleanup splash/Makefile.am

[patch] Cleanup splash/Makefile.am

Cleanup-splashMakefileam.patch (text/plain), 1.53 KB, created by Hib Eris on 2014-06-06 20:29:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hib Eris

Created: 2014-06-06 20:29:07 UTC

Size: 1.53 KB

patch

obsolete

>From eaa5e1b151bc383167a61f4700417e2941440776 Mon Sep 17 00:00:00 2001
>From: Hib Eris <hib@hiberis.nl>
>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

Actions: View | Splinter Review

Attachments on bug 79411: 100105 | 100538 | 100539 | 100540 | 100541 | 100542 | 100543 | 100544 | 100545 | 100546 | 100547 | 100548 | 100549 | 100550 | 100551 | 100552 | 100553 | 100554 | 100555 | 100556 | 100557 | 100558 | 103283

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.