[gitg] build: Do not use LDFLAGS to add libraries

[Ting-Wei Lan <lantw src gnome org>]

commit 4c185420e8347f9d454fddeb41a0003c986b9d4f
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Sun Aug 2 01:07:04 2015 +0800

    build: Do not use LDFLAGS to add libraries
    
    Libraries should be added to LIBADD or LDADD, not LDFLAGS.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753140

 gitg/Makefile.am          |    8 ++++----
 libgitg-ext/Makefile.am   |    6 +++---
 libgitg/Makefile.am       |    4 +++-
 plugins/diff/Makefile.am  |    5 +++--
 plugins/files/Makefile.am |    5 +++--
 tests/Makefile.am         |   11 ++++-------
 tests/libgitg/Makefile.am |    6 ++----
 7 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index 104229e..f49e98c 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -38,14 +38,14 @@ gitg_gitg_VALAFLAGS =                                               \
 gitg_gitg_LDADD =                                              \
        libgd/libgd.la                                          \
        libgitg/libgitg-1.0.la                                  \
-       libgitg-ext/libgitg-ext-1.0.la
+       libgitg-ext/libgitg-ext-1.0.la                          \
+       $(GITG_LIBS)                                            \
+       $(PACKAGE_LIBS)
 
 gitg_gitg_LDFLAGS =                                            \
        -export-dynamic                                         \
        -no-undefined                                           \
-       -export-symbols-regex "^[[^_]].*"                       \
-       $(GITG_LIBS)                                            \
-       $(PACKAGE_LIBS)
+       -export-symbols-regex "^[[^_]].*"
 
 gitg_gitg_VALASOURCES =                                                \
        gitg/commit/gitg-commit-dialog.vala                     \
diff --git a/libgitg-ext/Makefile.am b/libgitg-ext/Makefile.am
index 5ecb9b4..df8e167 100644
--- a/libgitg-ext/Makefile.am
+++ b/libgitg-ext/Makefile.am
@@ -35,11 +35,11 @@ libgitg_ext_libgitg_ext_1_0_la_VALAFLAGS =          \
 libgitg_ext_libgitg_ext_1_0_la_LDFLAGS =       \
        -export-dynamic                         \
        -no-undefined                           \
-       -export-symbols-regex "^[^_].*"         \
-       $(LIBGITG_EXT_LIBS)
+       -export-symbols-regex "^[^_].*"
 
 libgitg_ext_libgitg_ext_1_0_la_LIBADD =        \
-       libgitg/libgitg-1.0.la
+       libgitg/libgitg-1.0.la                  \
+       $(LIBGITG_EXT_LIBS)
 
 libgitg_ext_libgitg_ext_1_0_la_VALASOURCES =           \
        libgitg-ext/gitg-ext-action.vala                \
diff --git a/libgitg/Makefile.am b/libgitg/Makefile.am
index 5dc0031..772fdbf 100644
--- a/libgitg/Makefile.am
+++ b/libgitg/Makefile.am
@@ -16,7 +16,9 @@ libgitg_libgitg_1_0_la_CFLAGS =               \
 libgitg_libgitg_1_0_la_LDFLAGS =       \
        -export-dynamic                 \
        -no-undefined                   \
-       -export-symbols-regex "^[^_].*" \
+       -export-symbols-regex "^[^_].*"
+
+libgitg_libgitg_1_0_la_LIBADD =        \
        $(LIBGITG_LIBS)
 
 libgitg_libgitg_1_0_la_VALAFLAGS =     \
diff --git a/plugins/diff/Makefile.am b/plugins/diff/Makefile.am
index bb7b173..fa93e86 100644
--- a/plugins/diff/Makefile.am
+++ b/plugins/diff/Makefile.am
@@ -15,11 +15,12 @@ plugins_diff_libdiff_la_CFLAGS =                                    \
        $(WARN_CFLAGS)                                                  \
        -w
 
-plugins_diff_libdiff_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS) $(GITG_PLUGIN_LIBS)
+plugins_diff_libdiff_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS)
 
 plugins_diff_libdiff_la_LIBADD =                                       \
        libgitg/libgitg-1.0.la                                          \
-       libgitg-ext/libgitg-ext-1.0.la
+       libgitg-ext/libgitg-ext-1.0.la                                  \
+       $(GITG_PLUGIN_LIBS)
 
 plugins_diff_libdiff_la_VALAFLAGS = $(GITG_PLUGIN_VALAFLAGS)
 
diff --git a/plugins/files/Makefile.am b/plugins/files/Makefile.am
index dd1f996..73b30bb 100644
--- a/plugins/files/Makefile.am
+++ b/plugins/files/Makefile.am
@@ -15,11 +15,12 @@ plugins_files_libfiles_la_CFLAGS =                                  \
        $(WARN_CFLAGS)                                                  \
        -w
 
-plugins_files_libfiles_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS) $(GITG_PLUGIN_LIBS)
+plugins_files_libfiles_la_LDFLAGS = $(GITG_PLUGIN_LIBTOOL_FLAGS)
 
 plugins_files_libfiles_la_LIBADD =                                     \
        libgitg/libgitg-1.0.la                                          \
-       libgitg-ext/libgitg-ext-1.0.la
+       libgitg-ext/libgitg-ext-1.0.la                                  \
+       $(GITG_PLUGIN_LIBS)
 
 plugins_files_libfiles_la_VALAFLAGS = $(GITG_PLUGIN_VALAFLAGS)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cbe13cf..1fd7d6d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,7 +9,7 @@ tests_common_cflags =                   \
        $(GITG_CFLAGS)                  \
        -w
 
-tests_common_ldflags =                         \
+tests_common_ldadd =                   \
        $(GITG_PLUGIN_LIBS)
 
 tests_common_valaflags = $(GITG_PLUGIN_VALAFLAGS)
@@ -24,23 +24,20 @@ TESTS_DEMO_PROGS =                  \
 tests_diff_view_SOURCES = tests/diff-view.vala $(GITG_PLUGIN_VAPISOURCES)
 tests_diff_view_VALAFLAGS = $(tests_common_valaflags)
 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_diff_view_LDADD = libgitg/libgitg-1.0.la $(tests_common_ldadd)
 
 tests_repository_list_box_SOURCES = tests/repository-list-box.vala $(GITG_PLUGIN_VAPISOURCES)
 tests_repository_list_box_VALAFLAGS = $(tests_common_valaflags)
 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_repository_list_box_LDADD = libgitg/libgitg-1.0.la $(tests_common_ldadd)
 
 tests_progress_bin_SOURCES = tests/progress-bin.vala $(GITG_PLUGIN_VAPISOURCES)
 tests_progress_bin_VALAFLAGS = $(tests_common_valaflags)
 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
+tests_progress_bin_LDADD = libgitg/libgitg-1.0.la $(tests_common_ldadd)
 
 include tests/libgitg/Makefile.am
 
diff --git a/tests/libgitg/Makefile.am b/tests/libgitg/Makefile.am
index 16d0bfe..d289270 100644
--- a/tests/libgitg/Makefile.am
+++ b/tests/libgitg/Makefile.am
@@ -31,11 +31,9 @@ tests_libgitg_test_libgitg_CFLAGS =          \
        -g                                      \
        -w
 
-tests_libgitg_test_libgitg_LDFLAGS =           \
-       $(LIBGITG_LIBS)
-
 tests_libgitg_test_libgitg_LDADD =             \
-       libgitg/libgitg-1.0.la
+       libgitg/libgitg-1.0.la                  \
+       $(LIBGITG_LIBS)
 
 tests_libgitg_test_libgitg_SOURCES =           \
        tests/libgitg/test.vala                 \