[epiphany] Fix build on Debian systems
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Fix build on Debian systems
- Date: Wed, 7 Sep 2016 19:07:49 +0000 (UTC)
commit ec5b6c9b09b5e79a72cfc27dc38edf6f26e8b353
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Wed Sep 7 14:02:02 2016 -0500
Fix build on Debian systems
I don't understand, but Debian uses different linker settings from the
rest of the world, and the effect is that we have to explicitly link to
libephymisc.la in multiple places, even though it's already included in
libephymain.la and this shouldn't be necessary, else it will get
stripped from the linker command line.
src/Makefile.am | 2 ++
tests/Makefile.am | 3 ++-
2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 8b0f85b..17aec0e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,6 +171,7 @@ epiphany_CPPFLAGS = \
$(WEBKIT2GTK_CFLAGS)
epiphany_LDADD = \
+ $(top_builddir)/lib/libephymisc.la \
libephymain.la \
$(GLIB_LIBS) \
$(GTK_LIBS) \
@@ -211,6 +212,7 @@ epiphany_search_provider_CPPFLAGS = \
$(WEBKIT2GTK_CFLAGS)
epiphany_search_provider_LDADD = \
+ $(top_builddir)/lib/libephymisc.la \
libephymain.la \
$(GIO_LIBS) \
$(GLIB_LIBS) \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1def013..8e10200 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -112,7 +112,8 @@ AM_LDFLAGS = \
$(WARN_LDFLAGS)
LDADD = \
- $(top_builddir)/src/libephymain.la \
+ $(top_builddir)/src/libephymain.la \
+ $(top_builddir)/lib/libephymisc.la \
$(GDK_LIBS) \
$(GLIB_LIBS) \
$(GTK_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]