webkit-gtk: Update to 1.3.2

* Update the following files with 1.3.2 version in upstream:
    GNUmakefile.am
    Makefile
    Makefile.shared
    autogen.sh
    configure.ac

* Update the .bb with the one in openembeded(91eefa1e)

* inherit pkgconfig and remove dolt stuff according to RP's comments

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>

8 files changed, 1541 insertions, 485 deletions

diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 67a1032f84..d3d59274aa 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -119,7 +119,7 @@ SRCREV_pn-tasks ??= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
 SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
 SRCREV_pn-settings-daemon ??= "2059"
 SRCREV_pn-ubootchart ??= "10"
-SRCREV_pn-webkit-gtk ??= "31859"
+SRCREV_pn-webkit-gtk ??= "62027"
 SRCREV_pn-web-webkit ??= "110"
 SRCREV_pn-web ??= "97"
 SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
diff --git a/meta/packages/webkit/files/GNUmakefile.am b/meta/packages/webkit/files/GNUmakefile.am
index a0aefbf50b..39817f1dd5 100644
--- a/meta/packages/webkit/files/GNUmakefile.am
+++ b/meta/packages/webkit/files/GNUmakefile.am
@@ -5,7 +5,6 @@
 # _h_api            = API headers that will be installed and included in the distribution
 # _cppflags         = flags that will be passed to the C/CXX Preprocessor
 # _sources          = sources that will be compiled and included in the distribution
-# _headers          = header files that will be part of the distribution
 # _built_sources    = files that will be autogenerated by the build system and
 #                     will be part of the _SOURCES primary
 # _built_nosources  = files that are autogenerated but are not part of the
@@ -14,8 +13,9 @@
 #
 # Sources, headers, flags, etc... should be added to the respective variables
 # with the above suffix, e.g, webcore-specific sources should go to
-# webcore_sources, gtk port-specific flags should go to webkitgtk_cppflags,
-# etc... The only exceptions are the global variables. See Global Variables below.
+# webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources,
+# etc... The only exceptions are the global variables. See Global Variables
+# below.
 #
 # Global Variables
 #
@@ -29,223 +29,290 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-introspection	\
+	--enable-gtk-doc
+
 # Directory for autogenerated sources
 GENSOURCES := $(top_builddir)/DerivedSources
+GENSOURCESWEBKITDOM := $(top_builddir)/DerivedSources/webkit
+GENPROGRAMS := $(top_builddir)/Programs
 
 # Script for creating hash tables
-CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table
-
-# Libraries and support components
-noinst_HEADERS :=
+CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table
 
-noinst_PROGRAMS :=
+# Script for creating regexp tables
+CREATE_REGEXP_TABLES = $(srcdir)/JavaScriptCore/create_regex_tables
 
-lib_LIBRARIES :=
+# Programs to run the WebKitGtk unit tests
+GTESTER = gtester
+GTESTER_REPORT = gtester-report
 
+# Libraries and support components
+bin_PROGRAMS :=
+noinst_PROGRAMS :=
+noinst_HEADERS :=
+noinst_LTLIBRARIES :=
+lib_LTLIBRARIES :=
 IDL_BINDINGS :=
-
-# Files that will be distributed
+TEST_PROGS :=
+POFILES :=
+MOFILES :=
+javascriptcore_h_api :=
+javascriptcore_cppflags:=
+javascriptcore_sources :=
+javascriptcore_built_sources :=
+javascriptcore_built_nosources :=
+javascriptcore_dist :=
+webcore_cppflags :=
+webcore_sources :=
+webcore_libadd :=
+webcore_built_sources :=
+webcore_built_nosources :=
+webcore_dist :=
+webcoregtk_cppflags :=
+webcoregtk_sources :=
+IDL_BINDINGS_GDOM :=
+GDOM_AUTO_CLASSES :=
+GDOM_FIXED_CLASSES :=
+GDOM_CLASSES :=
+GDOM_HEADERS_BUILT :=
+GDOM_HEADERS_FIXED :=
+libgdom_h_api :=
+libgdom_cleanfiles :=
+webkitgtk_h_api :=
+webkitgtk_sources :=
+webkitgtk_cppflags :=
+webkitgtk_built_sources :=
+webkitgtk_built_nosources :=
+webkitgtk_cleanfiles :=
+global_cppflags :=
+global_cflags :=
+global_cxxflags :=
+corekit_cflags :=
+corekit_cppflags :=
+JSCORE_GIRSOURCES :=
+WEBKIT_GIRSOURCES :=
+typelibsdir :=
+typelibs_DATA :=
 EXTRA_DIST :=
+BUILT_SOURCES :=
+CLEANFILES :=
+DISTCLEANFILES :=
+MAINTAINERCLEANFILES :=
+
+webcoregtk_cppflags += \
+	-I$(top_builddir)/DerivedSources/webkit \
+	-I$(srcdir)/WebCore/bindings \
+	-I$(srcdir)/WebCore/bindings/gobject
 
+# CFLAGS/CXXFLAGS used by WebCore and WebKit
 #
-# Global flags to CPP
-global_cppflags :=
+# gtk+.pc already include glib, cairo, freetype and pango CFLAGS
+# Don't include them for now to reduce the noise when compiling
+# $(GLIB_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS)  $(FREETYPE_CFLAGS)
+corekit_cflags += \
+	-fno-strict-aliasing \
+	$(COVERAGE_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
+	$(GAIL_CFLAGS) \
+	$(GEOCLUE_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(GSTREAMER_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(HILDON_CFLAGS) \
+	$(LIBSOUP_CFLAGS) \
+	$(LIBXML_CFLAGS) \
+	$(LIBXSLT_CFLAGS) \
+	$(SQLITE3_CFLAGS) \
+	$(UNICODE_CFLAGS) \
+	$(XT_CFLAGS)
 
-global_cppflags += \
-	-DWTF_USE_ICU_UNICODE=1
+# When building webcore/webkit, we want WebCore/config.h and NOT
+# JavaScriptCore/config.h, hence, it's important that WebCore/ should come first
+# before JavaScriptCore in the include path.
+corekit_cppflags += \
+	$(global_cppflags) \
+	$(webcore_cppflags) \
+	$(webcoregtk_cppflags) \
+	$(javascriptcore_cppflags)
+
+# For the Gtk port we want to use XP_UNIX both in X11 and Mac
+if !TARGET_WIN32
+corekit_cppflags += -DXP_UNIX
+endif
 
 # Default compiler flags
-global_cflags := \
+global_cflags += \
 	-Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
 	-Wformat -Wformat-security -Wno-format-y2k -Wundef \
 	-Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
-	-Wno-unused-parameter
-
-global_cxxflags := \
-	$(SYMBOL_VISIBILITY_INLINES)
-
-if !ENABLE_DEBUG
-global_cflags += \
-	-fno-exceptions \
-	$(SYMBOL_VISIBILITY)
+	-Wno-unused-parameter -Wno-parentheses \
+	-fno-exceptions
 
 global_cxxflags += \
+	$(global_cflags) \
+	$(SYMBOL_VISIBILITY_INLINES) \
 	-fno-rtti
+
+# -no-undefined required for building DLLs on Windows
+# It breaks the build on other platforms, so we use it conditionally
+if OS_WIN32
+no_undefined = -no-undefined
+version_script = -export-symbols-regex "^(webkit_|JS).*"
+endif
+
+if OS_GNU
+version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
 endif
 
 # Shared libraries
-lib_LTLIBRARIES = \
-	libwebkit-1.0.la
+lib_LTLIBRARIES += \
+	libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
 
 # Convenience libraries
-noinst_LTLIBRARIES = \
-	libJavaScriptCore.la \
-	libWebCore.la
+noinst_LTLIBRARIES += \
+	libJavaScriptCore.la
 
-#
 # JavaScriptCore
-javascriptcore_h_api :=
-javascriptcore_cppflags:=
-javascriptcore_sources :=
-javascriptcore_built_sources :=
-javascriptcore_built_nosources :=
-
 javascriptcore_cppflags += \
-	-I$(srcdir)/JavaScriptCore \
 	-I$(srcdir)/JavaScriptCore/ForwardingHeaders \
+	-I$(srcdir)/JavaScriptCore/parser \
 	-I$(srcdir)/JavaScriptCore/wtf \
-	-I$(srcdir)/JavaScriptCore/kjs \
+	-I$(srcdir)/JavaScriptCore/wtf/gtk \
+	-I$(srcdir)/JavaScriptCore/wtf/gobject \
 	-I$(top_builddir)/DerivedSources
 
-# The variables above are already included below so no need to touch
-# these variables unless you really have to
-libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore
+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_built_sources) \
 	$(javascriptcore_sources)
 
 libJavaScriptCore_la_LIBADD = \
 	$(UNICODE_LIBS) \
-	$(GLOBALDEPS_LIBS) \
+	$(GLIB_LIBS) \
 	-lpthread
 
 libJavaScriptCore_la_CXXFLAGS = \
 	$(global_cxxflags) \
-	$(global_cflags) \
-	$(GLOBALDEPS_CFLAGS) \
-	$(UNICODE_CFLAGS) \
-	-fno-strict-aliasing
+	$(libJavaScriptCore_la_CFLAGS)
 
 libJavaScriptCore_la_CFLAGS = \
+	-fstrict-aliasing \
+	-O3 \
 	$(global_cflags) \
-	$(GLOBALDEPS_CFLAGS) \
-	$(UNICODE_CFLAGS) \
-	-fno-strict-aliasing
+	$(GLIB_CFLAGS) \
+	$(UNICODE_CFLAGS)
 
 libJavaScriptCore_la_CPPFLAGS = \
 	$(global_cppflags) \
 	$(javascriptcore_cppflags)
 
-#
-# WebCore
-webcore_cppflags :=
-webcore_sources :=
-webcore_headers :=
-webcore_libadd :=
-webcore_built_sources :=
-webcore_built_nosources :=
-
-webcore_cppflags += $(HILDON_CPPFLAGS)
-
 # WebKit
-webkitgtk_h_api :=
-webkitgtk_headers :=
-webkitgtk_sources :=
-webkitgtk_cppflags :=
-webkitgtk_built_sources :=
-webkitgtk_built_nosources :=
-webkitgtk_cleanfiles :=
+nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
+	$(webcore_built_nosources)
 
-libWebCore_la_SOURCES = \
+nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
 	$(webcore_built_sources) \
-	$(webcore_headers) \
-	$(webcore_sources)
+	$(webkitgtk_built_sources)
 
-libWebCore_la_CXXFLAGS = \
-	-fno-strict-aliasing \
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
+	$(webkitgtk_h_api) \
+	WebKit/gtk/webkit/webkitenumtypes.h
+
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
+	$(webcore_sources) \
+	$(webcoregtk_sources) \
+	$(webkitgtk_sources)
+
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
 	$(global_cxxflags) \
-	$(global_cflags) \
-	$(GLOBALDEPS_CFLAGS) \
-	$(UNICODE_CFLAGS) \
-	$(WEBKITDEPS_CFLAGS) \
-	$(LIBCURL_CFLAGS) \
-	$(LIBSOUP_CFLAGS) \
-	$(SQLITE3_CFLAGS) \
-	$(GSTREAMER_CFLAGS) \
-	$(LIBXSLT_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	$(HILDON_CFLAGS)
+	$(corekit_cflags)
 
-libWebCore_la_CFLAGS = \
-	-fno-strict-aliasing \
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
 	$(global_cflags) \
-	$(GLOBALDEPS_CFLAGS) \
-	$(UNICODE_CFLAGS) \
-	$(WEBKITDEPS_CFLAGS) \
-	$(LIBCURL_CFLAGS) \
-	$(LIBSOUP_CFLAGS) \
-	$(SQLITE3_CFLAGS) \
-	$(GSTREAMER_CFLAGS) \
-	$(LIBXSLT_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	$(HILDON_CFLAGS)
+	$(corekit_cflags)
 
-libWebCore_la_CPPFLAGS = \
-	$(global_cppflags) \
-	$(webcore_cppflags) \
-	$(javascriptcore_cppflags) \
-	$(webkitgtk_cppflags)
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
+	$(corekit_cppflags) \
+	$(webkitgtk_cppflags) \
+	$(HILDON_CPPFLAGS)
 
-libWebCore_la_LIBADD = \
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
+	-version-info @LIBWEBKITGTK_VERSION@ \
+	$(version_script) \
+	$(no_undefined)
+
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
+	-lpthread \
 	libJavaScriptCore.la \
-	$(webcore_libadd) \
-	$(GLOBALDEPS_LIBS) \
-	$(WEBKITDEPS_LIBS) \
-	$(LIBCURL_LIBS) \
-	$(LIBSOUP_LIBS) \
-	$(UNICODE_LIBS) \
-	$(SQLITE3_LIBS) \
+	libWebCoreJS.la \
+	libgdom.la \
+	$(webcore_ldflags) \
+	$(CAIRO_LIBS) \
+	$(COVERAGE_LDFLAGS) \
+	$(ENCHANT_LIBS) \
+	$(FREETYPE_LIBS) \
+	$(GAIL_LIBS) \
+	$(GEOCLUE_LIBS) \
+	$(GLIB_LIBS) \
 	$(GSTREAMER_LIBS) \
-	$(LIBXSLT_LIBS) \
+	$(GTK_LIBS) \
 	$(HILDON_LIBS) \
-	-lpthread \
-	-ljpeg
-
-libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit
-libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api)
-
-libwebkit_1_0_la_SOURCES = \
-	$(webkitgtk_built_sources) \
-	$(webkitgtk_headers) \
-	$(webkitgtk_sources)
-
-libwebkit_1_0_la_CXXFLAGS = \
-	$(libWebCore_la_CXXFLAGS)
-
-libwebkit_1_0_la_CFLAGS = \
-	$(libWebCore_la_CFLAGS)
+	$(JPEG_LIBS) \
+	$(LIBSOUP_LIBS) \
+	$(LIBXML_LIBS) \
+	$(LIBXSLT_LIBS) \
+	$(PANGO_LIBS) \
+	$(PNG_LIBS) \
+	$(SQLITE3_LIBS) \
+	$(UNICODE_LIBS) \
+	$(XT_LIBS)
 
-libwebkit_1_0_la_CPPFLAGS = \
-	$(libWebCore_la_CPPFLAGS)
+libgdom_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
+nodist_libgdom_la_HEADERS = \
+	$(libgdom_h_api)
 
-libwebkit_1_0_la_LDFLAGS = \
-	$(COVERAGE_LDFLAGS) \
-	-version-info @LIBWEBKITGTK_VERSION@
-
-libwebkit_1_0_la_LIBADD = \
-	libWebCore.la
+libgdom_cleanfiles += \
+	$(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h \
+	$(top_builddir)/libgdom.la \
+	$(top_builddir)/stamp-webkitdomenumtypes.h
 
 #
 # Extra checks and flags
 global_cppflags += \
+	-DBUILDING_CAIRO__=1 \
 	-DBUILDING_GTK__=1 \
 	-DWTF_CHANGES
 
-if !ENABLE_FAST_MALLOC
+if USE_ICU_UNICODE
 global_cppflags += \
-	-DUSE_SYSTEM_MALLOC
+	-DWTF_USE_ICU_UNICODE=1
+endif
+
+if USE_GLIB_UNICODE
+global_cppflags += \
+	-DWTF_USE_GLIB_UNICODE=1
 endif
 
-if TARGET_X11
-global_cppflags += -DXP_UNIX
+if !ENABLE_FAST_MALLOC
+global_cppflags += \
+	-DUSE_SYSTEM_MALLOC
 endif
 
 if !ENABLE_DEBUG
 global_cppflags += -DNDEBUG
+global_cflags += $(SYMBOL_VISIBILITY)
 else
-webkitgtk_cppflags += \
+webcoregtk_cppflags += \
 	-DG_DISABLE_DEPRECATED \
 	-DGDK_PIXBUF_DISABLE_DEPRECATED \
 	-DGDK_DISABLE_DEPRECATED \
@@ -257,131 +324,533 @@ webkitgtk_cppflags += \
 #	-DGTK_MULTIHEAD_SAFE
 endif
 
-if !ENABLE_DATABASE
-global_cppflags += -DENABLE_DATABASE=0
-endif
-
-if !ENABLE_ICONDATABASE
-global_cppflags += -DENABLE_ICONDATABASE=0
-endif
-
 if ENABLE_COVERAGE
 global_cppflags += \
 	-DGCC_GENERATE_TEST_COVERAGE_FILES \
 	-DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS
 endif
 
-if ENABLE_VIDEO
-webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
-endif
-
-webkitgtk_cppflags += \
--I$(top_builddir)/WebKit/gtk/webkit \
--DBUILDING_CAIRO__=1 \
--DBUILD_WEBKIT
-
 webkitgtk_h_api += \
-	WebKit/gtk/webkit/webkit.h \
-	WebKit/gtk/webkit/webkitdefines.h \
-	WebKit/gtk/webkit/webkitnetworkrequest.h \
-	WebKit/gtk/webkit/webkitwebbackforwardlist.h \
-	WebKit/gtk/webkit/webkitwebframe.h \
-	WebKit/gtk/webkit/webkitwebhistoryitem.h \
-	WebKit/gtk/webkit/webkitwebsettings.h \
-	WebKit/gtk/webkit/webkitwebview.h
+	$(srcdir)/WebKit/gtk/webkit/webkit.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitdefines.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitdownload.h \
+	$(srcdir)/WebKit/gtk/webkit/webkiterror.h \
+	$(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitsoupauthdialog.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebbackforwardlist.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebdatasource.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebframe.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebhistoryitem.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebinspector.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebview.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \
+	$(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \
+	$(top_builddir)/WebKit/gtk/webkit/webkitversion.h
 
 webkitgtk_built_sources += \
-	WebKit/gtk/webkit/webkit-marshal.h \
-	WebKit/gtk/webkit/webkit-marshal.cpp
+	DerivedSources/webkitenumtypes.cpp \
+	DerivedSources/webkitdomenumtypes.cpp \
+	DerivedSources/webkitmarshal.cpp \
+	DerivedSources/webkitmarshal.h \
+	WebKit/gtk/webkit/webkitenumtypes.h
 
-webkitgtk_headers += \
-	WebKit/gtk/webkit/webkitprivate.h \
+webkitgtk_sources += \
+	WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
 	WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
+	WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
 	WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
+	WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp \
+	WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \
+	WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
 	WebKit/gtk/WebCoreSupport/DragClientGtk.h \
+	WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
 	WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
+	WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
 	WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
+	WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
 	WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
-	WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h
-
-webkitgtk_sources += \
+	WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \
+	WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
+	WebKit/gtk/webkit/webkitapplicationcache.cpp \
+	WebKit/gtk/webkit/webkitdownload.cpp \
+	WebKit/gtk/webkit/webkiterror.cpp \
+	WebKit/gtk/webkit/webkithittestresult.cpp \
 	WebKit/gtk/webkit/webkitnetworkrequest.cpp \
+	WebKit/gtk/webkit/webkitnetworkresponse.cpp \
 	WebKit/gtk/webkit/webkitprivate.cpp \
+	WebKit/gtk/webkit/webkitprivate.h \
+	WebKit/gtk/webkit/webkitsoupauthdialog.c \
+	WebKit/gtk/webkit/webkitversion.cpp \
 	WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
+	WebKit/gtk/webkit/webkitwebdatasource.cpp \
 	WebKit/gtk/webkit/webkitwebframe.cpp \
 	WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
+	WebKit/gtk/webkit/webkitwebinspector.cpp \
+	WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
+	WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
+	WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
+	WebKit/gtk/webkit/webkitwebresource.cpp \
+	WebKit/gtk/webkit/webkitwebdatabase.cpp \
+	WebKit/gtk/webkit/webkitsecurityorigin.cpp \
 	WebKit/gtk/webkit/webkitwebsettings.cpp \
 	WebKit/gtk/webkit/webkitwebview.cpp \
-	WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
-	WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp
+	WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
+	WebKit/gtk/webkit/webkitworkers.cpp
+
+webkitgtk_cppflags += \
+	-DBUILDING_WEBKIT \
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+	-DDATA_DIR=\"${datadir}\" \
+	-I$(srcdir)/WebKit/gtk \
+	-I$(srcdir)/WebKit/gtk/WebCoreSupport \
+	-I$(srcdir)/WebKit/gtk/webkit \
+	-I$(top_builddir)/WebKit/gtk \
+	-I$(top_builddir)/WebKit/gtk/webkit \
+	-I$(GENSOURCESWEBKITDOM)
 
 webkitgtk_cleanfiles += \
+	$(top_builddir)/stamp-webkitmarshal.cpp \
+	$(top_builddir)/stamp-webkitmarshal.h \
+	$(top_builddir)/stamp-webkitenumtypes.cpp \
+	$(top_builddir)/stamp-webkitenumtypes.h \
 	$(top_builddir)/Programs/GtkLauncher \
-	$(top_builddir)/WebKit/gtk/webkit-1.0.pc
+	$(top_builddir)/WebKit/gtk/docs/version.xml \
+	$(top_builddir)/WebKit/gtk/docs/GNUmakefile \
+	$(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \
+	$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \
+	$(top_builddir)/WebKit/gtk/webkit/webkitversion.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
+pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
+
+if ENABLE_INTROSPECTION
+
+JSCore-@WEBKITGTK_API_VERSION@.gir: $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
+	cp $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(builddir)/
+
+JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir
+WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
+
+$(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
+	$(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=@WEBKITGTK_API_VERSION@ \
+	     --include=GObject-2.0 \
+	     --include=Gtk-@GTK_API_VERSION@ \
+	     --include=JSCore-@WEBKITGTK_API_VERSION@ \
+	     --include=Soup-2.4 \
+	     --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
+	     --libtool="$(LIBTOOL)" \
+	     --pkg gobject-2.0 \
+	     --pkg gtk+-@GTK_API_VERSION@ \
+	     --pkg libsoup-2.4 \
+	     --output $@ \
+	     --add-include-path $(top_srcdir)/WebKit/gtk \
+	     --add-include-path $(builddir) \
+	     -I$(top_srcdir)/WebKit/gtk \
+	     -I$(top_builddir)/WebKit/gtk \
+	     -I$(top_builddir)/DerivedSources \
+	     -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
+	     -I$(top_srcdir) \
+	     $(webkitgtk_h_api) \
+	     $(libgdom_h_api)
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
+
+typelibsdir += $(libdir)/girepository-1.0
+typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
+
+%.typelib: %.gir $(G_IR_COMPILER)
+	$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk --includedir $(builddir) $< -o $@
+
+CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
 
-WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal
-WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list
+endif
+
+EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
 
-stamp_files := \
-	stamp-webkit-marshal.cpp \
-	stamp-webkit-marshal.h
+WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
+WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
 
-WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp
+$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
 	@true
 
-WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h
+$(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h
 	@true
 
-stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)
-	echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
+stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
+	$(AM_V_GEN) echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
 	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
 	echo timestamp > $(@F)
 
-stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST)
-	$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
+stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
 	echo timestamp > $(@F)
 
-# END WEBKIT GTK+
+WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h
+	@true
+stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile
+	$(AM_V_GEN)glib-mkenums \
+			--fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
+			--fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \
+			--fhead "#include <glib-object.h>\n\n" \
+			--fhead "#include <webkit/webkitdefines.h>\n\n" \
+			--fhead "G_BEGIN_DECLS\n\n" \
+			--ftail "G_END_DECLS\n\n" \
+			--ftail "#endif\n" \
+			--fprod "#include <webkit/@basename@>\n\n" \
+			--eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
+			--eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \
+		$(webkitgtk_h_api) | \
+		sed 's,web_kit,webkit,' | \
+		sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
+		> xgen-gth \
+	&& (cmp -s xgen-gth WebKit/gtk/webkit/webkitenumtypes.h || cp xgen-gth WebKit/gtk/webkit/webkitenumtypes.h) \
+	&& rm -f xgen-gth \
+	&& echo timestamp > $(@F)
+
+DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
+	$(AM_V_GEN)glib-mkenums \
+			--fhead "#include <config.h>\n" \
+			--fhead "#include <glib-object.h>\n" \
+			--fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h\"\n\n" \
+			--fhead "extern \"C\" {\n\n" \
+			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
+			--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+			--vtail "    { 0, NULL, NULL }\n};\n\n" \
+			--vtail "GType @enum_name@_get_type(void)\n{\n" \
+			--vtail "    static GType type = 0;\n\n" \
+			--vtail "    if (!type)\n" \
+			--vtail "        type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
+			--vtail "    return type;\n}\n\n" \
+			--ftail "}\n" \
+		$(webkitgtk_h_api) | \
+		sed 's,web_kit,webkit,' \
+		> xgen-gtc \
+	&& cp xgen-gtc $@ \
+	&& rm -f xgen-gtc
+
+WebKit/gtk/webkit/webkitdomenumtypes.h: stamp-webkitdomenumtypes.h
+	@true
+stamp-webkitdomenumtypes.h: $(libgdom_h_api) GNUmakefile
+	$(AM_V_GEN)glib-mkenums \
+			--fhead "#ifndef WEBKIT_DOM_ENUM_TYPES_H\n" \
+			--fhead "#define WEBKIT_DOM_ENUM_TYPES_H\n\n" \
+			--fhead "#include <glib-object.h>\n\n" \
+			--fhead "G_BEGIN_DECLS\n\n" \
+			--ftail "G_END_DECLS\n\n" \
+			--ftail "#endif\n" \
+			--fprod "#include <webkit/@basename@>\n\n" \
+			--eprod "#define WEBKIT_DOM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
+			--eprod "WEBKIT_API GType\n@enum_name@_get_type(void);n\n" \
+			$(libgdom_h_api) | \
+		sed 's,web_kit,webkit_dom,' | \
+		sed 's,WEBKIT_DOM_TYPE_KIT,WEBKIT_DOM_TYPE,' \
+		> xgen-cgth \
+	&& (cmp -s xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h || cp xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h) \
+	&& rm -f xgen-cgth \
+	&& echo timestamp > $(@F)
+
+DerivedSources/webkitdomenumtypes.cpp: $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h $(libgdom_h_api) GNUmakefile
+	$(AM_V_GEN)glib-mkenums \
+			--fhead "#include <config.h>\n" \
+			--fhead "#include <glib-object.h>\n" \
+			--fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h\"\n\n" \
+			--fhead "extern \"C\" {\n\n" \
+			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--vhead "static const G@Type@Value _@enum_name@_values] = {" \
+			--vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+			--vtail "    { 0, NULL, NULL }\n};\n\n" \
+			--vtail "GType @enum_name@_get_type(void)\n{\n" \
+			--vtail "    static GType type = 0;\n\n" \
+			--vtail "    if (!type)\n" \
+			--vtail "        type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
+			--vtail "    return type;\n}\n\n" \
+			--ftail "}\n" \
+		$(libgdom_h_api) | \
+		sed 's,web_kit,webkitdom,' \
+		> xgen-cgtc \
+	&& cp xgen-cgtc $@ \
+	&& rm -f xgen-cgtc
 
-# Files that will be cleaned
-MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
-DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
-CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
+# Files that will be distributed
+EXTRA_DIST += \
+	$(srcdir)/gtk-doc.make \
+	WebKit/LICENSE \
+	$(javascriptcore_dist) \
+	$(webcore_dist) \
+	$(srcdir)/autotools/symbols.filter \
+	$(srcdir)/WebKit/gtk/ChangeLog \
+	$(srcdir)/WebKit/gtk/NEWS \
+	$(srcdir)/WebKit/gtk/webkitmarshal.list \
+	$(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
+	$(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
+	$(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
+	$(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
+	$(srcdir)/WebKit/gtk/docs/version.xml.in \
+	$(srcdir)/WebKit/gtk/po/* \
+	$(srcdir)/WebKit/gtk/resources/* \
+	$(srcdir)/WebKit/gtk/tests/resources/* \
+	$(srcdir)/WebKit/gtk/tests/test_utils.h
+
+# extra resource files
+resourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/resources
+dist_resources_DATA = \
+	$(shell ls $(srcdir)/WebKit/gtk/resources/*.html)
+
+# END WEBKIT GTK+
 
 # Include module makefiles
 include JavaScriptCore/GNUmakefile.am
 include WebCore/GNUmakefile.am
 include WebKitTools/GNUmakefile.am
+include WebKit/gtk/po/GNUmakefile.am
+
+# Build unit tests
+noinst_PROGRAMS += $(TEST_PROGS)
 
+webkit_tests_cflags = \
+	-fno-strict-aliasing \
+	-I$(srcdir)/JavaScriptCore/ForwardingHeaders \
+	-I$(srcdir)/WebKit/gtk \
+	-I$(top_builddir)/WebKit/gtk \
+	-I$(top_builddir)/DerivedSources \
+	-I$(top_srcdir)/WebCore/bindings \
+	-I$(top_srcdir)/WebCore/bindings/gobject \
+	$(global_cflags) \
+	$(GLIB_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(LIBSOUP_CFLAGS)
+
+webkit_tests_ldadd = \
+	libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+	$(GTK_LIBS)	\
+	$(GLIB_LIBS) \
+	$(LIBSOUP_LIBS)
+
+webkit_tests_ldflags = \
+	-no-install \
+	-no-fast-install
+
+TEST_PROGS += \
+	Programs/unittests/testdomdocument \
+	Programs/unittests/testdomdomwindow \
+	Programs/unittests/testdomnode \
+	Programs/unittests/testhttpbackend \
+	Programs/unittests/testloading \
+	Programs/unittests/testglobals \
+	Programs/unittests/testmimehandling \
+	Programs/unittests/testnetworkrequest \
+	Programs/unittests/testnetworkresponse \
+	Programs/unittests/testwebframe \
+	Programs/unittests/testwebbackforwardlist \
+	Programs/unittests/testwebhistoryitem \
+	Programs/unittests/testwindow \
+	Programs/unittests/testdownload \
+	Programs/unittests/testatk \
+	Programs/unittests/testatkroles \
+	Programs/unittests/testhittestresult \
+	Programs/unittests/testwebsettings \
+	Programs/unittests/testwebresource \
+	Programs/unittests/testwebdatasource \
+	Programs/unittests/testwebview \
+	Programs/unittests/testkeyevents \
+	Programs/unittests/testcopyandpaste
+
+# Add additional tests here
+Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c
+Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testdomdomwindow_SOURCES = WebKit/gtk/tests/testdomdomwindow.c
+Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testdomnode_SOURCES = WebKit/gtk/tests/testdomnode.c
+Programs_unittests_testdomnode_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testdomnode_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testdomnode_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c
+Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testglobals_SOURCES = WebKit/gtk/tests/testglobals.c
+Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testglobals_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c
+Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c WebKit/gtk/tests/test_utils.c
+Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c
+Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testnetworkresponse_SOURCES = WebKit/gtk/tests/testnetworkresponse.c
+Programs_unittests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testnetworkresponse_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c
+Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testwebframe_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testwebbackforwardlist_SOURCES = WebKit/gtk/tests/testwebbackforwardlist.c
+Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c
+Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testwindow_SOURCES = WebKit/gtk/tests/testwindow.c
+Programs_unittests_testwindow_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testwindow_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testwindow_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c
+Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testdownload_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testatk_SOURCES = WebKit/gtk/tests/testatk.c
+Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testatkroles_SOURCES = WebKit/gtk/tests/testatkroles.c
+Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testatkroles_LDFLAGS = $(webkit_tests_ldflags)
+