From 7e8a4dfb5f7a5377293eba28b033471c48030a74 Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Fri, 6 Jun 2014 19:27:42 +0200 Subject: [PATCH] Cleanup test/Makefile.am https://bugs.freedesktop.org/show_bug.cgi?id=79411 --- test/Makefile.am | 60 ++++++++++++++++++++++---------------------------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 89bebb1..8d7b923 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,57 +1,43 @@ -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 - +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 \ - $(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 \ $(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 \ @@ -60,9 +46,9 @@ pdf_inspector_LDADD = \ $(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 \ -- 1.8.3.2