[gtksourceview] Revert "build: list deps only in helper Libtool libraries"

[Garrett Regier <gregier src gnome org>]

commit a93ea8bcd8048d5690ca629dd504b21ef22260e7
Author: Garrett Regier <garrettregier gmail com>
Date:   Sun Jan 15 04:03:01 2017 -0800

    Revert "build: list deps only in helper Libtool libraries"
    
    This reverts commit e36e8fd22c23c2cd677381ce5dcd09adac1da18c.
    
    This is required for Ubuntu.

 gtksourceview/Makefile.am                          |    9 +++++----
 .../completion-providers/words/Makefile.am         |    4 +---
 tests/Makefile.am                                  |    5 ++++-
 testsuite/Makefile.am                              |    5 ++++-
 4 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 1344ce7..3f47154 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -166,9 +166,6 @@ libgtksourceview_core_la_LDFLAGS =  \
        $(WARN_LDFLAGS)
 
 libgtksourceview_core_la_LIBADD =      \
-       $(LIBM)                         \
-       $(DEP_LIBS)                     \
-       $(GTK_MAC_LIBS)                 \
        $(CODE_COVERAGE_LIBS)
 
 if OS_OSX
@@ -183,7 +180,11 @@ libgtksourceview_@GSV_API_VERSION@_la_SOURCES =
 
 libgtksourceview_@GSV_API_VERSION@_la_LIBADD =                                 \
        libgtksourceview-core.la                                        \
-       completion-providers/words/libgtksourcecompletionwords.la
+       completion-providers/words/libgtksourcecompletionwords.la       \
+       $(CODE_COVERAGE_LIBS)                                           \
+       $(LIBM)                                                         \
+       $(DEP_LIBS)                                                     \
+       $(GTK_MAC_LIBS)
 
 libgtksourceview_@GSV_API_VERSION@_la_CFLAGS = \
        $(HIDDEN_VISIBILITY_CFLAGS)             \
diff --git a/gtksourceview/completion-providers/words/Makefile.am 
b/gtksourceview/completion-providers/words/Makefile.am
index 7093707..2e4c1e5 100644
--- a/gtksourceview/completion-providers/words/Makefile.am
+++ b/gtksourceview/completion-providers/words/Makefile.am
@@ -36,9 +36,7 @@ libgtksourcecompletionwords_la_CFLAGS =               \
 libgtksourcecompletionwords_la_LDFLAGS =       \
        $(WARN_LDFLAGS)
 
-libgtksourcecompletionwords_la_LIBADD =        \
-       $(DEP_LIBS)                     \
-       $(GTK_MAC_LIBS)                 \
+libgtksourcecompletionwords_la_LIBADD =                \
        $(CODE_COVERAGE_LIBS)
 
 libgtksourcecompletionwords_includedir = \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3681dff..0c3fc26 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,7 +10,10 @@ AM_CPPFLAGS =                                \
 
 AM_LDFLAGS = $(WARN_LDFLAGS)
 
-LDADD = $(top_builddir)/gtksourceview/libgtksourceview-@GSV_API_VERSION@.la
+LDADD = $(top_builddir)/gtksourceview/libgtksourceview-@GSV_API_VERSION@.la \
+       $(LIBM) \
+       $(DEP_LIBS) \
+       $(TESTS_LIBS)
 
 BUILT_SOURCES =                                \
        test-completion-resources.c     \
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index f347107..8625f86 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -22,7 +22,10 @@ AM_CPPFLAGS =                                \
 AM_LDFLAGS = $(WARN_LDFLAGS)
 
 LDADD = $(top_builddir)/gtksourceview/completion-providers/words/libgtksourcecompletionwords.la \
-       $(top_builddir)/gtksourceview/libgtksourceview-core.la
+       $(top_builddir)/gtksourceview/libgtksourceview-core.la \
+       $(LIBM) \
+       $(DEP_LIBS) \
+       $(TESTS_LIBS)
 
 UNIT_TEST_PROGS =