aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2007-09-14 04:35:53 +0800
committerChristian Persch <chpe@src.gnome.org>2007-09-14 04:35:53 +0800
commit8d92314d3772cdb4fe0240a19743ca1cf7c93267 (patch)
tree0bb8422f34fbbb0f3a21a66ad43f4b28d5fe20cf
parent5c1e1426581eded08cc5d2506e342bc386a92ab7 (diff)
downloadgsoc2013-epiphany-8d92314d3772cdb4fe0240a19743ca1cf7c93267.tar
gsoc2013-epiphany-8d92314d3772cdb4fe0240a19743ca1cf7c93267.tar.gz
gsoc2013-epiphany-8d92314d3772cdb4fe0240a19743ca1cf7c93267.tar.bz2
gsoc2013-epiphany-8d92314d3772cdb4fe0240a19743ca1cf7c93267.tar.lz
gsoc2013-epiphany-8d92314d3772cdb4fe0240a19743ca1cf7c93267.tar.xz
gsoc2013-epiphany-8d92314d3772cdb4fe0240a19743ca1cf7c93267.tar.zst
gsoc2013-epiphany-8d92314d3772cdb4fe0240a19743ca1cf7c93267.zip
Add utils to LDADD to try to fix the linking.
svn path=/trunk/; revision=7433
-rw-r--r--embed/xulrunner/components/Makefile.am1
-rw-r--r--embed/xulrunner/embed/Makefile.am1
-rw-r--r--src/Makefile.am4
3 files changed, 5 insertions, 1 deletions
diff --git a/embed/xulrunner/components/Makefile.am b/embed/xulrunner/components/Makefile.am
index ad9b5f348..7280d6541 100644
--- a/embed/xulrunner/components/Makefile.am
+++ b/embed/xulrunner/components/Makefile.am
@@ -90,6 +90,7 @@ libephycomponents_la_LDFLAGS = \
$(AM_LDFLAGS)
libephycomponents_la_LIBADD = \
+ $(top_builddir)/embed/xulrunner/utils/libephyxulrunnerutils.la \
$(LIBXUL_LIBS)
CLEANFILES =
diff --git a/embed/xulrunner/embed/Makefile.am b/embed/xulrunner/embed/Makefile.am
index a2149a79b..d7c9bd503 100644
--- a/embed/xulrunner/embed/Makefile.am
+++ b/embed/xulrunner/embed/Makefile.am
@@ -62,4 +62,5 @@ libephyxulrunnerembed_la_CXXFLAGS = \
$(AM_CXXFLAGS)
libephyxulrunnerembed_la_LIBADD = \
+ $(top_builddir)/embed/xulrunner/utils/libephyxulrunnerutils.la \
$(top_builddir)/embed/xulrunner/src/libgnomegeckoembed.la
diff --git a/src/Makefile.am b/src/Makefile.am
index 8d08a4857..59d822b9c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -216,8 +216,10 @@ epiphany_LDADD = \
if WITH_XULRUNNER_ENGINE
epiphany_LDADD += \
+ $(top_builddir)/embed/xulrunner/utils/libephyxulrunnerutils.la \
$(top_builddir)/embed/xulrunner/src/libgnomegeckoembed.la \
- $(top_builddir)/embed/xulrunner/embed/libephyxulrunnerembed.la
+ $(top_builddir)/embed/xulrunner/embed/libephyxulrunnerembed.la \
+ $(top_builddir)/embed/xulrunner/components/libephycomponents.la
endif
if WITH_GECKO_ENGINE