From 572c60764bbbd2080bfd7a926c646ad20b467aea Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Tue, 12 Aug 2014 18:12:45 +0200
Subject: Makefile.am cleanups

Bug #79411
---
 test/Makefile.am | 68 +++++++++++++++++++-------------------------------------
 1 file changed, 23 insertions(+), 45 deletions(-)

(limited to 'test')

diff --git a/test/Makefile.am b/test/Makefile.am
index af5bcf22..8d7b923d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,76 +1,54 @@
-if BUILD_GTK_TEST
-
-if BUILD_SPLASH_OUTPUT
+AM_LDFLAGS = @auto_import_flags@
 
-splash_includes =				\
-	-I$(top_srcdir)/splash
+AM_CPPFLAGS =					\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/poppler
 
-endif
+noinst_PROGRAMS = pdf-fullrewrite
 
+if BUILD_GTK_TEST
+noinst_PROGRAMS += gtk-test
 if BUILD_CAIRO_OUTPUT
-
-pdf_inspector =				\
-	pdf_inspector
-
-cairo_includes =				\
-	$(CAIRO_CFLAGS)				\
-	$(FREETYPE_CFLAGS)
-
+noinst_PROGRAMS += pdf_inspector
 endif
-
-gtk_test = \
-	gtk-test
-
 endif
 
 if BUILD_SPLASH_OUTPUT
-
-perf_test =				\
-	perf-test
-
+noinst_PROGRAMS += perf-test
 endif
 
-pdf_fullrewrite = \
-	pdf-fullrewrite
-
-INCLUDES =					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/poppler			\
-	-I$(top_srcdir)/glib			\
-	-I$(top_builddir)/glib			\
-	$(cairo_includes)			\
-	$(GTK_TEST_CFLAGS)
-
-noinst_PROGRAMS = $(pdf_inspector) $(perf_test) $(pdf_fullrewrite) $(gtk_test)
-
-AM_LDFLAGS = @auto_import_flags@
-
 gtk_test_SOURCES =					\
 	gtk-test.cc
 
+gtk_test_CPPFLAGS =					\
+	$(AM_CPPFLAGS)					\
+	-I$(top_srcdir)/glib				\
+	-I$(top_builddir)/glib				\
+	$(GTK_TEST_CFLAGS)
+
 gtk_test_LDADD =					\
 	$(top_builddir)/poppler/libpoppler.la           \
 	$(top_builddir)/glib/libpoppler-glib.la         \
-	$(CAIRO_LIBS)					\
 	$(GTK_TEST_LIBS)				\
 	$(PTHREAD_LIBS)
 
+pdf_inspector_SOURCES =					\
+	pdf-inspector.cc
 
-pdf_inspector_SOURCES =			\
-       pdf-inspector.cc
+pdf_inspector_CPPFLAGS =				\
+	$(AM_CPPFLAGS)					\
+	$(GTK_TEST_CFLAGS)
 
 pdf_inspector_LDADD =					\
 	$(top_builddir)/poppler/libpoppler-cairo.la	\
 	$(top_builddir)/poppler/libpoppler.la		\
-	$(CAIRO_LIBS)					\
-	$(FREETYPE_LIBS)				\
 	$(GTK_TEST_LIBS)				\
 	$(X_EXTRA_LIBS)					\
 	$(PTHREAD_LIBS)
 
-perf_test_SOURCES =			\
-       perf-test.cc                     \
-       perf-test-preview-dummy.cc
+perf_test_SOURCES =					\
+	perf-test.cc					\
+	perf-test-preview-dummy.cc
 
 perf_test_LDADD =				\
 	$(top_builddir)/poppler/libpoppler.la	\
-- 
cgit v1.2.3