diff options
| author | Xan Lopez <xan@gnome.org> | 2007-07-28 04:27:56 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@src.gnome.org> | 2007-07-28 04:27:56 +0800 |
| commit | c75bf8633191306efc4120fd589d0c375f286e71 (patch) | |
| tree | e573b99549ca95c38ef67c9dd5d53829cb545a30 /doc | |
| parent | ec7067fd30fe1bd5d0b69a648359d8085328f398 (diff) | |
| download | gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar.gz gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar.bz2 gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar.lz gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar.xz gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar.zst gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.zip | |
Add support for the WebKit engine, compile with --with-engine=webkit to
2007-07-27 Xan Lopez <xan@gnome.org>
* Makefile.am:
* configure.ac:
* doc/reference/Makefile.am:
* embed/Makefile.am:
* embed/ephy-embed-factory.c: (ephy_embed_factory_new_object):
* embed/ephy-embed-persist.c:
* embed/ephy-embed-shell.c:
* embed/ephy-embed.c:
* embed/webkit/Makefile.am:
* embed/webkit/webkit-embed-find.cpp:
* embed/webkit/webkit-embed-find.h:
* embed/webkit/webkit-embed-persist.cpp:
* embed/webkit/webkit-embed-persist.h:
* embed/webkit/webkit-embed-single.cpp:
* embed/webkit/webkit-embed-single.h:
* embed/webkit/webkit-embed.cpp:
* embed/webkit/webkit-embed.h:
* src/Makefile.am:
Add support for the WebKit engine, compile with
--with-engine=webkit to activate.
* embed/mozilla/mozilla-embed-single.cpp:
Move to the G_DEFINE_TYPE_WITH_CODE macro.
svn path=/trunk/; revision=7208
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/Makefile.am | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index ba985e0e6..edbc7e38e 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -80,6 +80,9 @@ IGNORE_HFILES = \ mozilla-notifiers.h \ MozillaPrivate.h \ MozRegisterComponents.h \ + webkit-embed.h \ + webkit-embed-persist.h \ + webkit-embed-single.h \ PrintingPromptService.h \ egg-editable-toolbar.h \ eggintl.h \ @@ -142,14 +145,10 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/lib/widgets \ -I$(top_srcdir)/embed \ -I$(top_builddir)/embed \ - -I$(top_srcdir)/embed/mozilla \ -I$(top_srcdir)/src/bookmarks \ -I$(top_srcdir)/lib/egg \ -I$(top_builddir)/lib/egg \ - -I$(GECKO_INCLUDE_ROOT) \ - -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz \ $(DEPENDENCIES_CFLAGS) \ - $(GECKO_CFLAGS) \ $(DBUS_CFLAGS) \ $(INCINTL) @@ -157,7 +156,6 @@ GTKDOC_LIBS = \ $(top_builddir)/src/libephymain.la \ $(top_builddir)/src/bookmarks/libephybookmarks.la \ $(top_builddir)/embed/libephyembedfactory.la \ - $(top_builddir)/embed/mozilla/libephymozillaembed.la \ $(top_builddir)/embed/libephyembed.la \ $(top_builddir)/lib/widgets/libephywidgets.la \ $(top_builddir)/lib/libephymisc.la \ @@ -168,6 +166,22 @@ GTKDOC_LIBS = \ $(DBUS_LIBS) \ $(LIBINTL) +if WITH_GECKO_ENGINE + GTKDOC_LIBS += $(top_builddir)/embed/mozilla/libephymozillaembed.la + + GTKDOC_CFLAGS += -I$(top_srcdir)/embed/mozilla \ + -I$(GECKO_INCLUDE_ROOT) \ + -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz \ + $(GECKO_CFLAGS) +endif + +if WITH_WEBKIT_ENGINE + GTKDOC_LIBS += $(top_builddir)/embed/webkit/libephywebkitembed.la + + GTKDOC_CFLAGS += -I$(top_srcdir)/embed/webkit \ + $(WEBKIT_CFLAGS) +endif + if ENABLE_PYTHON GTKDOC_LIBS += \ $(top_builddir)/src/libpyphany.la \ |