summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorHib Eris <hib@hiberis.nl>2014-09-14 11:20:23 +0200
committerAlbert Astals Cid <aacid@kde.org>2014-09-29 00:27:49 +0200
commit21b5fd655ce45b90668d1416d21c526ab7eb3ad6 (patch)
tree8941473d633ee026ded129ec904a070efd4ec09a /test
parent70a851b0cc58241d1f2f6bc48af2614595326c8f (diff)
Refactor Makefiles to build a noinst library for parsing args
Prevents this automake warning about possible forward-incompatibility: $ ./autogen.sh ... cpp/tests/Makefile.am:16: warning: source file '$(top_srcdir)/utils/parseargs.cc' is in a subdirectory, cpp/tests/Makefile.am:16: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. cpp/tests/Makefile.am:20: warning: source file '$(top_srcdir)/utils/parseargs.cc' is in a subdirectory, cpp/tests/Makefile.am:20: but option 'subdir-objects' is disabled parallel-tests: installing './test-driver' test/Makefile.am:58: warning: source file '../utils/parseargs.cc' is in a subdirectory, test/Makefile.am:58: but option 'subdir-objects' is disabled $ automake --version automake (GNU automake) 1.14.1 ... https://bugs.freedesktop.org/show_bug.cgi?id=83839
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 8d7b923d..16f2b1a0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -55,11 +55,11 @@ perf_test_LDADD = \
$(FREETYPE_LIBS) \
$(X_EXTRA_LIBS)
-pdf_fullrewrite_SOURCES = \
- pdf-fullrewrite.cc \
- ../utils/parseargs.cc
+pdf_fullrewrite_SOURCES = \
+ pdf-fullrewrite.cc
-pdf_fullrewrite_LDADD = \
+pdf_fullrewrite_LDADD = \
+ $(top_builddir)/utils/libparseargs.la \
$(top_builddir)/poppler/libpoppler.la
EXTRA_DIST = \