diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2020-04-26 21:29:52 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2020-04-26 21:50:14 +0200 |
| commit | 2cad525e2babac75395caf367449d9e9b31fcd42 (patch) | |
| tree | 653e5d03f43414e3347be176f816d4f5a9015c5d /test | |
| parent | 20c5726e9442ebaf3711043cc0f317a600fb9c75 (diff) | |
Fix out-of-tree building.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rw-r--r-- | test/dgreftest/Makefile.am | 2 | ||||
| -rw-r--r-- | test/uitests/Makefile.am | 23 |
3 files changed, 19 insertions, 10 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 8332cbe..001d13d 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -98,7 +98,7 @@ enginetest_CXXFLAGS = -DOUTPUT=\"enginetest\" \ -I$(top_srcdir)/src \ -I$(top_srcdir)/hugin $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS) enginetest_LDFLAGS = $(PTHREAD_LIBS) $(SNDFILE_LIBS) \ - $(top_srcdir)/src/libdg.la + $(top_builddir)/src/libdg.la enginetest_SOURCES = \ $(top_srcdir)/hugin/hugin.c \ dgtest.cc \ @@ -229,7 +229,7 @@ domloadertest_CXXFLAGS = -DOUTPUT=\"domloadertest\" \ $(DEBUG_FLAGS) \ -I$(top_srcdir)/src domloadertest_LDFLAGS = \ - $(top_srcdir)/src/libdg.la + $(top_builddir)/src/libdg.la domloadertest_SOURCES = \ $(top_srcdir)/hugin/hugin.c \ domloadertest.cc \ diff --git a/test/dgreftest/Makefile.am b/test/dgreftest/Makefile.am index 12e5303..d89a53a 100644 --- a/test/dgreftest/Makefile.am +++ b/test/dgreftest/Makefile.am @@ -4,7 +4,7 @@ if HAVE_INPUT_MIDIFILE noinst_PROGRAMS = dgreftest dgreftest_LDADD = $(PTHREAD_LIBS) $(JACK_LIBS) \ - $(SMF_LIBS) $(top_srcdir)/src/libdg.la + $(SMF_LIBS) $(top_builddir)/src/libdg.la dgreftest_LDFLAGS = diff --git a/test/uitests/Makefile.am b/test/uitests/Makefile.am index 0c6821e..bd2c6d1 100644 --- a/test/uitests/Makefile.am +++ b/test/uitests/Makefile.am @@ -1,7 +1,9 @@ noinst_PROGRAMS = resizetest tabwidgettest framewidgettest \ filebrowsertest benchmarktest -resizetest_LDADD = $(top_srcdir)/plugingui/libdggui.la $(top_srcdir)/src/libdg.la +resizetest_LDADD = \ + $(top_builddir)/plugingui/libdggui.la \ + $(top_builddir)/src/libdg.la resizetest_CXXFLAGS = \ -I$(top_srcdir)/plugingui \ -I$(top_srcdir)/src \ @@ -10,7 +12,9 @@ resizetest_SOURCES = \ resizetest.cc \ $(top_srcdir)/hugin/hugin.c -tabwidgettest_LDADD = $(top_srcdir)/plugingui/libdggui.la $(top_srcdir)/src/libdg.la +tabwidgettest_LDADD = \ + $(top_builddir)/plugingui/libdggui.la \ + $(top_builddir)/src/libdg.la tabwidgettest_CXXFLAGS = \ -I$(top_srcdir)/plugingui \ -I$(top_srcdir)/src \ @@ -19,7 +23,9 @@ tabwidgettest_SOURCES = \ tabwidgettest.cc \ $(top_srcdir)/hugin/hugin.c -filebrowsertest_LDADD = $(top_srcdir)/plugingui/libdggui.la $(top_srcdir)/src/libdg.la +filebrowsertest_LDADD = \ + $(top_builddir)/plugingui/libdggui.la \ + $(top_builddir)/src/libdg.la filebrowsertest_CXXFLAGS = \ -I$(top_srcdir)/plugingui \ -I$(top_srcdir)/src \ @@ -28,7 +34,9 @@ filebrowsertest_SOURCES = \ filebrowsertest.cc \ $(top_srcdir)/hugin/hugin.c -framewidgettest_LDADD = $(top_srcdir)/plugingui/libdggui.la $(top_srcdir)/src/libdg.la +framewidgettest_LDADD = \ + $(top_builddir)/plugingui/libdggui.la \ + $(top_builddir)/src/libdg.la framewidgettest_CXXFLAGS = \ -I$(top_srcdir)/plugingui \ -I$(top_srcdir)/src \ @@ -43,11 +51,12 @@ RES = \ benchmarktest_resources/image_edge_alpha.png \ benchmarktest_resources/image_inner_alpha.png -benchmarktest_resource_data.cc : $(top_srcdir)/plugingui/rcgen $(RES) - $(top_srcdir)/plugingui/rcgen $(RES) > benchmarktest_resource_data.cc +benchmarktest_resource_data.cc: $(top_builddir)/plugingui/rcgen $(RES) + $(top_builddir)/plugingui/rcgen -d $(top_srcdir)/test/uitests $(RES) > $(top_srcdir)/test/uitests/benchmarktest_resource_data.cc benchmarktest_LDADD = \ - $(top_srcdir)/plugingui/libdggui.la $(top_srcdir)/src/libdg.la + $(top_builddir)/plugingui/libdggui.la \ + $(top_builddir)/src/libdg.la benchmarktest_CXXFLAGS = \ -I$(top_srcdir)/plugingui \ -I$(top_srcdir)/src \ |