[gtksourceview] build: list deps only in helper Libtool libraries
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] build: list deps only in helper Libtool libraries
- Date: Wed, 21 Dec 2016 19:20:55 +0000 (UTC)
commit e36e8fd22c23c2cd677381ce5dcd09adac1da18c
Author: Sébastien Wilmet <swilmet gnome org>
Date: Wed Dec 21 20:08:17 2016 +0100
build: list deps only in helper Libtool libraries
No need to duplicate the list of dependencies for each
library/executable. When linking to a *.la file, the dependencies are
taken from the *.la file as well.
gtksourceview/Makefile.am | 9 ++++-----
.../completion-providers/words/Makefile.am | 4 +++-
tests/Makefile.am | 2 --
testsuite/Makefile.am | 2 --
4 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 3f47154..1344ce7 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -166,6 +166,9 @@ libgtksourceview_core_la_LDFLAGS = \
$(WARN_LDFLAGS)
libgtksourceview_core_la_LIBADD = \
+ $(LIBM) \
+ $(DEP_LIBS) \
+ $(GTK_MAC_LIBS) \
$(CODE_COVERAGE_LIBS)
if OS_OSX
@@ -180,11 +183,7 @@ libgtksourceview_@GSV_API_VERSION@_la_SOURCES =
libgtksourceview_@GSV_API_VERSION@_la_LIBADD = \
libgtksourceview-core.la \
- completion-providers/words/libgtksourcecompletionwords.la \
- $(CODE_COVERAGE_LIBS) \
- $(LIBM) \
- $(DEP_LIBS) \
- $(GTK_MAC_LIBS)
+ completion-providers/words/libgtksourcecompletionwords.la
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 2e4c1e5..7093707 100644
--- a/gtksourceview/completion-providers/words/Makefile.am
+++ b/gtksourceview/completion-providers/words/Makefile.am
@@ -36,7 +36,9 @@ libgtksourcecompletionwords_la_CFLAGS = \
libgtksourcecompletionwords_la_LDFLAGS = \
$(WARN_LDFLAGS)
-libgtksourcecompletionwords_la_LIBADD = \
+libgtksourcecompletionwords_la_LIBADD = \
+ $(DEP_LIBS) \
+ $(GTK_MAC_LIBS) \
$(CODE_COVERAGE_LIBS)
libgtksourcecompletionwords_includedir = \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d8f231e..b9202df 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,8 +12,6 @@ AM_CPPFLAGS = \
AM_LDFLAGS = $(WARN_LDFLAGS)
LDADD = $(top_builddir)/gtksourceview/libgtksourceview-@GSV_API_VERSION@.la \
- $(LIBM) \
- $(DEP_LIBS) \
$(TESTS_LIBS)
BUILT_SOURCES = \
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 6660c08..5fbe8a1 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -24,8 +24,6 @@ AM_LDFLAGS = $(WARN_LDFLAGS)
LDADD = $(top_builddir)/gtksourceview/completion-providers/words/libgtksourcecompletionwords.la \
$(top_builddir)/gtksourceview/libgtksourceview-core.la \
- $(LIBM) \
- $(DEP_LIBS) \
$(TESTS_LIBS)
UNIT_TEST_PROGS =
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]