[gspell] Revert "build: list deps only in the helper Libtool library"

[Garrett Regier <gregier src gnome org>]

commit b94bc74de5b61c39fbd9da23b2b034b3c353aa79
Author: Garrett Regier <garrettregier gmail com>
Date:   Sun Jan 15 03:58:47 2017 -0800

    Revert "build: list deps only in the helper Libtool library"
    
    This reverts commit c1d49bc1b38b31bbe4adbefa806d2657bef242c4.
    
    This is required for Ubuntu.

 gspell/Makefile.am    |   10 ++++++----
 tests/Makefile.am     |    4 +++-
 testsuite/Makefile.am |    3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/gspell/Makefile.am b/gspell/Makefile.am
index e5b03fc..076a9fd 100644
--- a/gspell/Makefile.am
+++ b/gspell/Makefile.am
@@ -91,8 +91,6 @@ nodist_libgspell_core_la_SOURCES = \
        $(BUILT_SOURCES)
 
 libgspell_core_la_LIBADD =     \
-       $(DEP_LIBS)             \
-       $(GTK_MAC_LIBS)         \
        $(CODE_COVERAGE_LIBS)
 
 libgspell_core_la_CFLAGS =     \
@@ -108,9 +106,13 @@ lib_LTLIBRARIES = libgspell-@GSPELL_API_VERSION@.la
 libgspell_@GSPELL_API_VERSION@_la_SOURCES =
 
 libgspell_@GSPELL_API_VERSION@_la_LIBADD =     \
-       libgspell-core.la
+       libgspell-core.la                       \
+       $(DEP_LIBS)                             \
+       $(GTK_MAC_LIBS)                         \
+       $(CODE_COVERAGE_LIBS)
 
-libgspell_@GSPELL_API_VERSION@_la_CFLAGS =
+libgspell_@GSPELL_API_VERSION@_la_CFLAGS =     \
+       $(CODE_COVERAGE_CFLAGS)
 
 libgspell_@GSPELL_API_VERSION@_la_LDFLAGS =    \
        -version-info $(GSPELL_LT_VERSION)      \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c43ac9a..7d208f9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,9 @@ AM_CPPFLAGS =                   \
 
 AM_LDFLAGS = $(WARN_LDFLAGS)
 
-LDADD = $(top_builddir)/gspell/libgspell-@GSPELL_API_VERSION@.la
+LDADD =        $(top_builddir)/gspell/libgspell-@GSPELL_API_VERSION@.la        \
+       $(DEP_LIBS)                                                     \
+       $(GTK_MAC_LIBS)
 
 TEST_PROGS =
 
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 5fde22d..4384baf 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -18,7 +18,8 @@ AM_CPPFLAGS =                         \
 
 AM_LDFLAGS = $(WARN_LDFLAGS)
 
-LDADD = $(top_builddir)/gspell/libgspell-core.la
+LDADD = $(top_builddir)/gspell/libgspell-core.la       \
+       $(DEP_LIBS)
 
 UNIT_TEST_PROGS =