From c8c9a17ae2603ccb34641d4188850a18e6ce6096 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Wed, 30 Nov 2011 15:58:40 +0100
Subject: webkit-gtk svn: update to r101488

tested on beagleboard/angstrom with midori and epiphany browsers

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-sato/webkit/files/GNUmakefile.am | 37 ++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

(limited to 'meta/recipes-sato/webkit/files/GNUmakefile.am')

diff --git a/meta/recipes-sato/webkit/files/GNUmakefile.am b/meta/recipes-sato/webkit/files/GNUmakefile.am
index fb10790b1..4d2785f24 100644
--- a/meta/recipes-sato/webkit/files/GNUmakefile.am
+++ b/meta/recipes-sato/webkit/files/GNUmakefile.am
@@ -27,7 +27,8 @@ VPATH = @srcdir@
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-introspection	\
-	--enable-gtk-doc
+	--enable-gtk-doc \
+	--enable-webkit2
 
 # Directory for autogenerated sources
 GENSOURCES := $(top_builddir)/DerivedSources
@@ -40,10 +41,13 @@ GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
 WebCore := $(srcdir)/Source/WebCore
 WebKit := $(srcdir)/Source/WebKit/gtk
 WebKit2 := $(srcdir)/Source/WebKit2
+pkgconfigdir := $(libdir)/pkgconfig
+libwebkitgtkincludedir := $(prefix)/include/webkitgtk-@WEBKITGTK_API_VERSION@
 
 # Libraries and support components
 bin_PROGRAMS :=
 noinst_PROGRAMS :=
+libexec_PROGRAMS :=
 noinst_HEADERS :=
 noinst_LTLIBRARIES :=
 lib_LTLIBRARIES :=
@@ -73,6 +77,8 @@ webkitgtk_gdom_built_sources :=
 webkitgtk_built_sources :=
 webkitgtk_built_nosources :=
 webkit2_built_sources :=
+webkit2_plugin_process_built_sources :=
+webkittestrunner_built_sources :=
 libwebcoreinternals_built_sources :=
 global_cppflags :=
 global_cflags :=
@@ -85,8 +91,10 @@ typelibs_DATA :=
 EXTRA_DIST :=
 BUILT_SOURCES :=
 CLEANFILES :=
+DOMAIN :=
 DISTCLEANFILES :=
 MAINTAINERCLEANFILES :=
+pkgconfig_DATA :=
 
 # We do not care at all about this implicit built-in make rules,
 # disable them to save some build time
@@ -187,11 +195,13 @@ endif
 
 EXTRA_DIST += \
 	$(srcdir)/Source/autotools/symbols.filter \
-	$(srcdir)/gtk-doc.make \
 	$(srcdir)/Source/WebKit/LICENSE
 
 # Include module makefiles
+if USE_JSC
 include Source/JavaScriptCore/GNUmakefile.am
+endif
+
 include Source/WebCore/GNUmakefile.am
 include Source/WebKit/gtk/GNUmakefile.am
 include Source/WebCore/bindings/gobject/GNUmakefile.am
@@ -201,6 +211,7 @@ include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
 
 if ENABLE_WEBKIT2
 include Source/WebKit2/GNUmakefile.am
+include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
 include Tools/MiniBrowser/gtk/GNUmakefile.am
 include Tools/WebKitTestRunner/GNUmakefile.am
 # [GTK] Refactor the translations now that we have webkit2
@@ -209,13 +220,17 @@ endif
 
 # Autogenerated sources
 BUILT_SOURCES += \
-	$(javascriptcore_built_sources) \
-	$(javascriptcore_built_nosources) \
 	$(webcore_built_sources) \
 	$(webcore_built_nosources) \
 	$(webkitgtk_built_sources) \
 	$(webkitgtk_built_nosources)
 
+if USE_JSC
+BUILT_SOURCES += \
+	$(javascriptcore_built_sources) \
+	$(javascriptcore_built_nosources)
+endif
+
 DISTCLEANFILES += \
 	$(CLEANFILES) \
 	$(builddir)/doltcompile \
@@ -249,3 +264,17 @@ clean-local:
 maintainer-clean-local: distclean-local
 distclean-local:
 	-rm -rf $(GENSOURCES) $(GENPROGRAMS)
+
+dist-hook: doc-dist-hook
+doc-dist-hook: docs-build.stamp
+	cp $(WebKit)/NEWS $(distdir)
+	@mkdir -p $(distdir)/Documentation/webkitgtk/html
+	@mkdir -p $(distdir)/Documentation/webkitgtk/tmpl
+	@-cp ./Documentation/webkitgtk/tmpl/*.sgml $(distdir)/Documentation/webkitgtk/tmpl
+	@cp ./Documentation/webkitgtk/html/* $(distdir)/Documentation/webkitgtk/html
+if ENABLE_WEBKIT2
+	@mkdir -p $(distdir)/Documentation/webkit2gtk/html
+	@mkdir -p $(distdir)/Documentation/webkit2gtk/tmpl
+	@-cp ./Documentation/webkit2gtk/tmpl/*.sgml $(distdir)/Documentation/webkit2gtk/tmpl
+	@cp ./Documentation/webkit2gtk/html/* $(distdir)/Documentation/webkit2gtk/html
+endif
-- 
cgit v1.2.3