[gitg] Cleanly specify _LDADD and _LIBADD

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 8c4ce51acdac6537c66084f6ce2aeb4e7b7064e7
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sat Jan 4 18:25:19 2014 +0100

    Cleanly specify _LDADD and _LIBADD
    
    This solves problems with .la dependencies and parallel build

 configure.ac              |    5 +----
 gitg/Makefile.am          |   14 +++++++-------
 libgitg-ext/Makefile.am   |    6 ++++--
 libgitg/Makefile.am       |    5 ++---
 plugins/diff/Makefile.am  |    8 ++++++--
 plugins/files/Makefile.am |    8 ++++++--
 tests/Makefile.am         |   12 +++++++++---
 tests/libgitg/Makefile.am |    6 ++++--
 8 files changed, 39 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a0a1672..e7c2b38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,10 +215,7 @@ GITG_PLUGIN_LIBDIR="$libdir/gitg/plugins"
 AC_SUBST(GITG_PLUGIN_LIBDIR)
 
 GITG_PLUGIN_CFLAGS="$GITG_CFLAGS"
-GITG_PLUGIN_LIBS="$GITG_LIBS                                   \
-       \$(top_builddir)/libgd/libgd.la                         \
-       \$(top_builddir)/libgitg/libgitg-1.0.la                 \
-       \$(top_builddir)/libgitg-ext/libgitg-ext-1.0.la"
+GITG_PLUGIN_LIBS="$GITG_LIBS"
 
 AC_SUBST(GITG_PLUGIN_CFLAGS)
 AC_SUBST(GITG_PLUGIN_LIBS)
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index e559703..049333f 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -37,17 +37,17 @@ gitg_gitg_VALAFLAGS =                                               \
        --vapidir "$(top_builddir)/libgitg-ext"                 \
        --gresources "$(top_srcdir)/gitg/resources/gitg-resources.xml"
 
-gitg_gitg_LDADD =                                                      \
-       $(GITG_LIBS)                                            \
-       $(PACKAGE_LIBS)                                         \
-       $(top_builddir)/libgd/libgd.la                          \
-       $(top_builddir)/libgitg/libgitg-1.0.la                  \
-       $(top_builddir)/libgitg-ext/libgitg-ext-1.0.la
+gitg_gitg_LDADD =                                              \
+       libgd/libgd.la                                          \
+       libgitg/libgitg-1.0.la                                  \
+       libgitg-ext/libgitg-ext-1.0.la
 
 gitg_gitg_LDFLAGS =                                            \
        -export-dynamic                                         \
        -no-undefined                                           \
-       -export-symbols-regex "^[[^_]].*"
+       -export-symbols-regex "^[[^_]].*"                       \
+       $(GITG_LIBS)                                            \
+       $(PACKAGE_LIBS)
 
 gitg_gitg_VALASOURCES =                                                \
        gitg/gitg.vala                                          \
diff --git a/libgitg-ext/Makefile.am b/libgitg-ext/Makefile.am
index d6dbb10..9c0c223 100644
--- a/libgitg-ext/Makefile.am
+++ b/libgitg-ext/Makefile.am
@@ -36,9 +36,11 @@ libgitg_ext_libgitg_ext_1_0_la_VALAFLAGS =           \
 libgitg_ext_libgitg_ext_1_0_la_LDFLAGS =       \
        -export-dynamic                         \
        -no-undefined                           \
-       -export-symbols-regex "^[^_].*"
+       -export-symbols-regex "^[^_].*"         \
+       $(LIBGITG_EXT_LIBS)
 
-libgitg_ext_libgitg_ext_1_0_la_LIBADD = $(LIBGITG_EXT_LIBS)
+libgitg_ext_libgitg_ext_1_0_la_LIBADD =        \
+       libgitg/libgitg-1.0.la
 
 libgitg_ext_libgitg_ext_1_0_la_VALASOURCES =           \
        libgitg-ext/gitg-ext-assembly-info.vala         \
diff --git a/libgitg/Makefile.am b/libgitg/Makefile.am
index 57f5b00..81109f1 100644
--- a/libgitg/Makefile.am
+++ b/libgitg/Makefile.am
@@ -15,9 +15,8 @@ libgitg_libgitg_1_0_la_CFLAGS =               \
 libgitg_libgitg_1_0_la_LDFLAGS =       \
        -export-dynamic                 \
        -no-undefined                   \
-       -export-symbols-regex "^[^_].*"
-
-libgitg_libgitg_1_0_la_LIBADD = $(LIBGITG_LIBS)
+       -export-symbols-regex "^[^_].*" \
+       $(LIBGITG_LIBS)
 
 libgitg_libgitg_1_0_la_VALAFLAGS =     \
        --pkg Ggit-1.0                  \
diff --git a/plugins/diff/Makefile.am b/plugins/diff/Makefile.am
index b61f62b..b25c97e 100644
--- a/plugins/diff/Makefile.am
+++ b/plugins/diff/Makefile.am
@@ -13,8 +13,12 @@ plugins_diff_libdiff_la_CFLAGS =                                     \
        $(WARN_CFLAGS)                                                  \
        -w
 
-plugins_diff_libdiff_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS)
-plugins_diff_libdiff_la_LIBADD = $(GITG_PLUGIN_LIBS)
+plugins_diff_libdiff_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS) $(GITG_PLUGIN_LIBS)
+
+plugins_diff_libdiff_la_LIBADD =                                       \
+       libgitg/libgitg-1.0.la                                          \
+       libgitg-ext/libgitg-ext-1.0.la
+
 plugins_diff_libdiff_la_VALAFLAGS = $(GITG_PLUGIN_VALAFLAGS)
 
 plugins_diff_libdiff_la_VALASOURCES =                                  \
diff --git a/plugins/files/Makefile.am b/plugins/files/Makefile.am
index 98f89b7..83f2c28 100644
--- a/plugins/files/Makefile.am
+++ b/plugins/files/Makefile.am
@@ -13,8 +13,12 @@ plugins_files_libfiles_la_CFLAGS =                                   \
        $(WARN_CFLAGS)                                                  \
        -w
 
-plugins_files_libfiles_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS)
-plugins_files_libfiles_la_LIBADD = $(GITG_PLUGIN_LIBS)
+plugins_files_libfiles_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS) $(GITG_PLUGIN_LIBS)
+
+plugins_files_libfiles_la_LIBADD =                                     \
+       libgitg/libgitg-1.0.la                                          \
+       libgitg-ext/libgitg-ext-1.0.la
+
 plugins_files_libfiles_la_VALAFLAGS = $(GITG_PLUGIN_VALAFLAGS)
 
 plugins_files_libfiles_la_VALASOURCES =                                        \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3f9cef4..db937cc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,6 +9,9 @@ tests_common_cflags =                   \
        $(GITG_CFLAGS)                  \
        -w
 
+tests_common_ldflags =                         \
+       $(GITG_PLUGIN_LIBS)
+
 tests_common_valaflags = $(GITG_PLUGIN_VALAFLAGS)
 
 noinst_PROGRAMS += $(TESTS_DEMO_PROGS)
@@ -20,21 +23,24 @@ TESTS_DEMO_PROGS =                  \
 
 tests_diff_view_SOURCES = tests/diff-view.vala
 tests_diff_view_VALAFLAGS = $(tests_common_valaflags)
-tests_diff_view_LDADD = $(GITG_PLUGIN_LIBS)
 tests_diff_view_CFLAGS = $(tests_common_cflags)
+tests_diff_view_LDFLAGS = $(tests_common_ldflags)
 tests_diff_view_CPPFLAGS = $(tests_common_cppflags)
+tests_diff_view_LDADD = libgitg/libgitg-1.0.la
 
 tests_repository_list_box_SOURCES = tests/repository-list-box.vala
 tests_repository_list_box_VALAFLAGS = $(tests_common_valaflags)
-tests_repository_list_box_LDADD = $(GITG_PLUGIN_LIBS)
 tests_repository_list_box_CFLAGS = $(tests_common_cflags)
+tests_repository_list_box_LDFLAGS = $(tests_common_ldflags)
 tests_repository_list_box_CPPFLAGS = $(tests_common_cppflags)
+tests_repository_list_box_LDADD = libgitg/libgitg-1.0.la
 
 tests_progress_bin_SOURCES = tests/progress-bin.vala
 tests_progress_bin_VALAFLAGS = $(tests_common_valaflags)
-tests_progress_bin_LDADD = $(GITG_PLUGIN_LIBS)
 tests_progress_bin_CFLAGS = $(tests_common_cflags)
+tests_progress_bin_LDFLAGS = $(tests_common_ldflags)
 tests_progress_bin_CPPFLAGS = $(tests_common_cppflags)
+tests_progress_bin_LDADD = libgitg/libgitg-1.0.la
 
 GITIGNOREFILES +=                                      \
        $(tests_diff_view_SOURCES:%.vala=%.c)           \
diff --git a/tests/libgitg/Makefile.am b/tests/libgitg/Makefile.am
index 91def6e..f91ae80 100644
--- a/tests/libgitg/Makefile.am
+++ b/tests/libgitg/Makefile.am
@@ -33,10 +33,12 @@ tests_libgitg_test_libgitg_CFLAGS =         \
        -g                                      \
        -w
 
-tests_libgitg_test_libgitg_LDADD =             \
-       $(top_builddir)/libgitg/libgitg-1.0.la  \
+tests_libgitg_test_libgitg_LDFLAGS =           \
        $(LIBGITG_LIBS)
 
+tests_libgitg_test_libgitg_LDADD =             \
+       libgitg/libgitg-1.0.la
+
 tests_libgitg_test_libgitg_SOURCES =           \
        tests/libgitg/test.vala                 \
        tests/libgitg/main.vala                 \