summaryrefslogtreecommitdiff
path: root/splash
diff options
context:
space:
mode:
authorHib Eris <hib@hiberis.nl>2014-08-12 18:12:45 +0200
committerAlbert Astals Cid <aacid@kde.org>2014-08-12 18:13:54 +0200
commit572c60764bbbd2080bfd7a926c646ad20b467aea (patch)
treede55967a1efc008172894c2e79b7fd94b13f8096 /splash
parent4a4fe80d85a31b10822c7cd8eb5a0698bf306a52 (diff)
Makefile.am cleanups
Bug #79411
Diffstat (limited to 'splash')
-rw-r--r--splash/Makefile.am42
1 files changed, 21 insertions, 21 deletions
diff --git a/splash/Makefile.am b/splash/Makefile.am
index 4330c53a..5c265d63 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)