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
This commit is contained in:
Ting-Wei Lan 2015-08-02 01:07:04 +08:00
parent b182dafae5
commit 4c185420e8
7 changed files with 22 additions and 23 deletions

View file

@ -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 \

View file

@ -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 \

View file

@ -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 = \

View file

@ -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)

View file

@ -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)

View file

@ -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

View file

@ -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 \