aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2007-09-10 05:11:39 +0800
committerChristian Persch <chpe@src.gnome.org>2007-09-10 05:11:39 +0800
commitb3a75061677399de19355802c54c4d355653f284 (patch)
tree689385d476a8034eb7d5fd1d7939b7b01b6468eb /src
parent0e3d0325dab1bfa25b1af72cc8b1f8dcddfa9dc7 (diff)
downloadgsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar
gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar.gz
gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar.bz2
gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar.lz
gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar.xz
gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.tar.zst
gsoc2013-epiphany-b3a75061677399de19355802c54c4d355653f284.zip
A m4/libxul.m4: Integrate the "xulrunner" backend with configure. Not
2007-09-09 Christian Persch <chpe@gnome.org> * configure.ac: * embed/Makefile.am: * embed/ephy-embed-factory.c: (ephy_embed_factory_new_object): * m4/gecko.m4: A m4/libxul.m4: * src/Makefile.am: Integrate the "xulrunner" backend with configure. Not building yet. svn path=/trunk/; revision=7359
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 214b813b5..cf5545b73 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = epiphany
EXTRA_DIST =
-headerdir = $(prefix)/include/epiphany/@EPIPHANY_MAJOR@/epiphany
+headerdir = $(prefix)/include/epiphany/$(EPIPHANY_MAJOR)/epiphany
header_DATA = \
ephy-type-builtins.h \
$(INST_H_FILES)
@@ -210,6 +210,11 @@ epiphany_LDADD = \
$(top_builddir)/src/bookmarks/libephybookmarks.la \
$(top_builddir)/embed/libephyembedfactory.la
+if WITH_XULRUNNER_ENGINE
+epiphany_LDADD += \
+ $(top_builddir)/embed/xulrunner/embed/libephymozillaembed.la
+endif
+
if WITH_GECKO_ENGINE
epiphany_LDADD += \
$(top_builddir)/embed/mozilla/libephymozillaembed.la
@@ -226,6 +231,11 @@ epiphany_LDADD += \
$(top_builddir)/lib/libephymisc.la \
$(top_builddir)/lib/egg/libegg.la
+if WITH_XULRUNNER_ENGINE
+epiphany_LDFLAGS += -R$(LIBXUL_LIBDIR)
+epiphany_LDADD += $(LIBXUL_LIBS)
+endif
+
if WITH_GECKO_ENGINE
epiphany_LDFLAGS += -R$(GECKO_HOME)