1 files changed, 52 insertions, 55 deletions

diff --git a/meta/recipes-sato/webkit/files/GNUmakefile.am b/meta/recipes-sato/webkit/files/GNUmakefile.am
index 8884fcb6f9..fb10790b1e 100644
--- a/meta/recipes-sato/webkit/files/GNUmakefile.am
+++ b/meta/recipes-sato/webkit/files/GNUmakefile.am
@@ -34,10 +34,12 @@ GENSOURCES := $(top_builddir)/DerivedSources
 GENSOURCES_JAVASCRIPTCORE := $(top_builddir)/DerivedSources/JavaScriptCore
 GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
 GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
+GENSOURCES_WEBKIT2 := $(top_builddir)/DerivedSources/WebKit2
 GENPROGRAMS := $(top_builddir)/Programs
 GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
-WebCore := $(srcdir)/WebCore
-WebKit := $(srcdir)/WebKit/gtk
+WebCore := $(srcdir)/Source/WebCore
+WebKit := $(srcdir)/Source/WebKit/gtk
+WebKit2 := $(srcdir)/Source/WebKit2
 
 # Libraries and support components
 bin_PROGRAMS :=
@@ -51,6 +53,7 @@ POFILES :=
 MOFILES :=
 javascriptcore_h_api :=
 javascriptcore_cppflags:=
+javascriptcore_cflags :=
 javascriptcore_sources :=
 javascriptcore_built_sources :=
 javascriptcore_built_nosources :=
@@ -69,6 +72,8 @@ webkitgtk_cppflags :=
 webkitgtk_gdom_built_sources :=
 webkitgtk_built_sources :=
 webkitgtk_built_nosources :=
+webkit2_built_sources :=
+libwebcoreinternals_built_sources :=
 global_cppflags :=
 global_cflags :=
 global_cxxflags :=
@@ -83,6 +88,21 @@ CLEANFILES :=
 DISTCLEANFILES :=
 MAINTAINERCLEANFILES :=
 
+# We do not care at all about this implicit built-in make rules,
+# disable them to save some build time
+%: %.c
+%: %.cpp
+%: %.o
+(%): %
+%.out: %
+%.c: %.w %.ch
+%.tex: %.w %.ch
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
+
 global_cppflags += \
         -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
         -Wformat -Wformat-security -Wno-format-y2k -Wundef \
@@ -92,7 +112,6 @@ global_cppflags += \
 
 
 global_cxxflags += \
-        $(SYMBOL_VISIBILITY_INLINES) \
         -fno-rtti
 
 # -no-undefined required for building DLLs on Windows
@@ -103,51 +122,21 @@ version_script = -export-symbols-regex "^(webkit_|k?JS).*"
 endif
 
 if OS_GNU
-version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
+version_script = -Wl,--version-script,$(srcdir)/Source/autotools/symbols.filter
 endif
 
-# Convenience libraries
-noinst_LTLIBRARIES += \
-        libJavaScriptCore.la
-
-nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
-        $(javascriptcore_built_nosources)
-
-nodist_libJavaScriptCore_la_SOURCES = \
-        $(javascriptcore_built_sources)
-
-libJavaScriptCore_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/JavaScriptCore
-libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
-
-libJavaScriptCore_la_SOURCES = \
-        $(javascriptcore_sources)
-
-libJavaScriptCore_la_LIBADD = \
-        $(UNICODE_LIBS) \
-        $(GLIB_LIBS) \
-        -lpthread
-
-libJavaScriptCore_la_CXXFLAGS = \
-        $(global_cxxflags) \
-        $(libJavaScriptCore_la_CFLAGS)
-
-libJavaScriptCore_la_CFLAGS = \
-        -fstrict-aliasing \
-        -O3 \
-        $(global_cflags) \
-        $(GLIB_CFLAGS) \
-        $(UNICODE_CFLAGS)
-
-libJavaScriptCore_la_CPPFLAGS = \
-        $(global_cppflags) \
-        $(javascriptcore_cppflags)
-
 # Extra checks and flags
 global_cppflags += \
         -DBUILDING_CAIRO__=1 \
         -DBUILDING_GTK__=1 \
         -DWTF_CHANGES
 
+# For the Gtk port we want to use XP_UNIX both in X11 and Mac
+if !TARGET_WIN32
+global_cppflags += \
+        -DXP_UNIX
+endif
+
 if USE_ICU_UNICODE
 global_cppflags += \
         -DWTF_USE_ICU_UNICODE=1
@@ -178,7 +167,6 @@ endif
 
 if !ENABLE_DEBUG
 global_cppflags += -DNDEBUG
-global_cflags += $(SYMBOL_VISIBILITY)
 else
 global_cppflags += \
         -DG_DISABLE_DEPRECATED \
@@ -198,17 +186,26 @@ global_cppflags += \
 endif
 
 EXTRA_DIST += \
-        $(srcdir)/autotools/symbols.filter \
+        $(srcdir)/Source/autotools/symbols.filter \
         $(srcdir)/gtk-doc.make \
-        $(srcdir)/WebKit/LICENSE
+        $(srcdir)/Source/WebKit/LICENSE
 
 # Include module makefiles
-include JavaScriptCore/GNUmakefile.am
-include WebCore/GNUmakefile.am
-include WebKit/gtk/GNUmakefile.am
-include WebCore/bindings/gobject/GNUmakefile.am
-include WebKitTools/GNUmakefile.am
-include WebKit/gtk/po/GNUmakefile.am
+include Source/JavaScriptCore/GNUmakefile.am
+include Source/WebCore/GNUmakefile.am
+include Source/WebKit/gtk/GNUmakefile.am
+include Source/WebCore/bindings/gobject/GNUmakefile.am
+include Tools/GNUmakefile.am
+include Source/WebKit/gtk/po/GNUmakefile.am
+include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
+
+if ENABLE_WEBKIT2
+include Source/WebKit2/GNUmakefile.am
+include Tools/MiniBrowser/gtk/GNUmakefile.am
+include Tools/WebKitTestRunner/GNUmakefile.am
+# [GTK] Refactor the translations now that we have webkit2
+# https://bugs.webkit.org/show_bug.cgi?id=55153
+endif
 
 # Autogenerated sources
 BUILT_SOURCES += \
@@ -229,11 +226,11 @@ MAINTAINERCLEANFILES += \
         $(builddir)/doltcompile \
         $(builddir)/doltlibtool \
         $(srcdir)/aconfig.h.in \
-        $(srcdir)/autotools/config.* \
-        $(srcdir)/autotools/compile \
-        $(srcdir)/autotools/depcomp \
-        $(srcdir)/autotools/install-sh \
-        $(srcdir)/autotools/missing \
+        $(srcdir)/Source/autotools/config.* \
+        $(srcdir)/Source/autotools/compile \
+        $(srcdir)/Source/autotools/depcomp \
+        $(srcdir)/Source/autotools/install-sh \
+        $(srcdir)/Source/autotools/missing \
         $(srcdir)/configure \
         $(srcdir)/GNUmakefile.in \
         $(srcdir)/INSTALL \
@@ -242,7 +239,7 @@ MAINTAINERCLEANFILES += \
 
 # Older automake versions (1.7) place Plo files in a different place so we need
 # to create the output directory manually.
-all-local:
+all-local: stamp-po
         $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
 
 # remove built sources and program directories