[gnome-commander/googletest] Adds LDADD variable for all current tests



commit 3c573e80c955fd4fae8418fbee5ead30b6046ea0
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Mon Nov 30 22:37:50 2015 +0100

    Adds LDADD variable for all current tests

 tests/Makefile.am |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 516226a..08b357c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,9 +14,10 @@ INTVLIBS = \
        $(GOBJECT_CFLAGS) \
        $(GTK_LIBS) \
        $(GNOMEUI_LIBS) \
-       $(top_builddir)/src/intviewer/libgviewer.a \
-       -lgtest \
-       -lglib-2.0 
+       -lgtest
+
+ADDITIONAL_LDADD = \
+       $(top_builddir)/src/intviewer/libgviewer.a
 
 TESTS = \
        iv_viewerwidget \
@@ -35,29 +36,36 @@ check_PROGRAMS = $(TESTS)
 iv_imagerenderer_SOURCES = iv_imagerenderer_test.cc gcmd_tests_main.cc
 iv_imagerenderer_CXXFLAGS = $(AM_CPPFLAGS)
 iv_imagerenderer_LDFLAGS = $(INTVLIBS)
+iv_imagerenderer_LDADD = $(ADDITIONAL_LDADD)
 
 iv_inputmodes_SOURCES = iv_inputmodes_test.cc gcmd_tests_main.cc
 iv_inputmodes_CXXFLAGS = $(AM_CPPFLAGS)
 iv_inputmodes_LDFLAGS = $(INTVLIBS)
+iv_inputmodes_LDADD = $(ADDITIONAL_LDADD)
 
 iv_textrenderer_SOURCES = iv_textrenderer_test.cc gcmd_tests_main.cc
 iv_textrenderer_CXXFLAGS = $(AM_CPPFLAGS)
 iv_textrenderer_LDFLAGS = $(INTVLIBS)
+iv_textrenderer_LDADD = $(ADDITIONAL_LDADD)
 
 iv_viewerwidget_SOURCES = iv_viewerwidget_test.cc gcmd_tests_main.cc
 iv_viewerwidget_CXXFLAGS = $(AM_CPPFLAGS)
 iv_viewerwidget_LDFLAGS = $(INTVLIBS)
+iv_viewerwidget_LDADD = $(ADDITIONAL_LDADD)
 
 iv_fileops_SOURCES = iv_fileops_test.cc gcmd_tests_main.cc 
 iv_fileops_CXXFLAGS = $(AM_CPPFLAGS)
 iv_fileops_LDFLAGS = $(INTVLIBS)
+iv_fileops_LDADD = $(ADDITIONAL_LDADD)
 
 iv_bm_search_SOURCES = iv_bm_search_test.cc gcmd_tests_main.cc
 iv_bm_search_CXXFLAGS = $(AM_CPPFLAGS)
 iv_bm_search_LDFLAGS = $(INTVLIBS)
+iv_bm_search_LDADD = $(ADDITIONAL_LDADD)
 
 iv_datapresentation_SOURCES = iv_datapresentation.cc gcmd_tests_main.cc
 iv_datapresentation_CXXFLAGS = $(AM_CPPFLAGS)
 iv_datapresentation_LDFLAGS = $(INTVLIBS)
+iv_datapresentation_LDADD = $(ADDITIONAL_LDADD)
 
 -include $(top_srcdir)/git.mk


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]