[gtksourceview] build: dynamic linking for interactive tests



commit ce65a05629d5f338de053a78830705d62245a0c6
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Apr 15 21:46:04 2016 +0200

    build: dynamic linking for interactive tests
    
    Static linking was used by default, because we linked against the
    libtool static convenience libraries. But all tests/*.c files depend
    only on public GtkSourceView API, so we can use dynamic linking instead.
    
    The unit tests used to be in tests/, but they are now in testsuite/. In
    testsuite/, we need static linking to be able to test private functions.
    Now that there are two different directories and two different
    Makefile.am's, we can set the right default values for both.

 tests/Makefile.am |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5952197..55b67bf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,8 +11,7 @@ AM_CPPFLAGS =                                 \
 
 AM_LDFLAGS = $(WARN_LDFLAGS)
 
-LDADD = $(top_builddir)/gtksourceview/completion-providers/words/libgtksourcecompletionwords.la \
-       $(top_builddir)/gtksourceview/libgtksourceview-core.la \
+LDADD = $(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
        -lm \
        $(DEP_LIBS) \
        $(TESTS_LIBS)
@@ -38,18 +37,10 @@ test-widget-resources.c: test-widget.gresource.xml $(shell $(GLIB_COMPILE_RESOUR
 TEST_PROGS = test-completion
 test_completion_SOURCES = test-completion.c
 nodist_test_completion_SOURCES = test-completion-resources.c
-test_completion_LDADD =                                                \
-       $(top_builddir)/gtksourceview/libgtksourceview-3.0.la   \
-       $(DEP_LIBS)                                             \
-       $(TESTS_LIBS)
 
 TEST_PROGS += test-search
 test_search_SOURCES = test-search.c
 nodist_test_search_SOURCES = test-search-resources.c
-test_search_LDADD =                                            \
-       $(top_builddir)/gtksourceview/libgtksourceview-3.0.la   \
-       $(DEP_LIBS)                                             \
-       $(TESTS_LIBS)
 
 TEST_PROGS += test-search-performances
 test_search_performances_SOURCES = test-search-performances.c
@@ -63,10 +54,6 @@ test_undo_manager_performances_SOURCES = test-undo-manager-performances.c
 TEST_PROGS += test-widget
 test_widget_SOURCES = test-widget.c
 nodist_test_widget_SOURCES = test-widget-resources.c
-test_widget_LDADD =                                            \
-       $(top_builddir)/gtksourceview/libgtksourceview-3.0.la   \
-       $(DEP_LIBS)                                             \
-       $(TESTS_LIBS)
 
 python_tests =                 \
        test-completion.py      \


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