git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c44bb81)
2010-12-15 Sheriff Bot <webkit.review.bot@gmail.com>
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 Dec 2010 18:49:59 +0000 (18:49 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 Dec 2010 18:49:59 +0000 (18:49 +0000)
        Unreviewed, rolling out r74117.
        http://trac.webkit.org/changeset/74117
        https://bugs.webkit.org/show_bug.cgi?id=51113

        This broke the GTK1 build. (Requested by mrobinson on
        #webkit).

        * GNUmakefile.am:
        * configure.ac:
2010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r74117.
        http://trac.webkit.org/changeset/74117
        https://bugs.webkit.org/show_bug.cgi?id=51113

        This broke the GTK1 build. (Requested by mrobinson on
        #webkit).

        * GNUmakefile.am:
        * platform/network/soup/cache/webkit/soup-cache.h:
2010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r74117.
        http://trac.webkit.org/changeset/74117
        https://bugs.webkit.org/show_bug.cgi?id=51113

        This broke the GTK1 build. (Requested by mrobinson on
        #webkit).

        * GNUmakefile.am:
2010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r74117.
        http://trac.webkit.org/changeset/74117
        https://bugs.webkit.org/show_bug.cgi?id=51113

        This broke the GTK1 build. (Requested by mrobinson on
        #webkit).

        * GNUmakefile.am: Removed.
        * Scripts/generate-forwarding-headers.pl:
        * WebKit2Prefix.h:
        * gtk/webkit2.pc.in: Removed.
2010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r74117.
        http://trac.webkit.org/changeset/74117
        https://bugs.webkit.org/show_bug.cgi?id=51113

        This broke the GTK1 build. (Requested by mrobinson on
        #webkit).

        * Scripts/webkitdirs.pm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@74124 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
ChangeLog patch | blob | history
GNUmakefile.am patch | blob | history
WebCore/ChangeLog patch | blob | history
WebCore/GNUmakefile.am patch | blob | history
WebCore/platform/network/soup/cache/webkit/soup-cache.h patch | blob | history
WebKit/gtk/ChangeLog patch | blob | history
WebKit/gtk/GNUmakefile.am patch | blob | history
WebKit2/ChangeLog patch | blob | history
WebKit2/GNUmakefile.am [deleted file] patch | blob | history
WebKit2/Scripts/generate-forwarding-headers.pl patch | blob | history
WebKit2/WebKit2Prefix.h patch | blob | history
WebKit2/gtk/webkit2.pc.in [deleted file] patch | blob | history
WebKitTools/ChangeLog patch | blob | history
WebKitTools/Scripts/webkitdirs.pm patch | blob | history
configure.ac patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 69ea52bb3446a2206c5a671721d821b4d231f2ee..2172fd36f36f5efda30f1dd557a7f75d926b3b1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r74117.
+        http://trac.webkit.org/changeset/74117
+        https://bugs.webkit.org/show_bug.cgi?id=51113
+
+        This broke the GTK1 build. (Requested by mrobinson on
+        #webkit).
+
+        * GNUmakefile.am:
+        * configure.ac:
+
 2010-12-15  Amruth Raj  <amruthraj@motorola.com> and Ravi Kasibhatla  <ravi.kasibhatla@motorola.com>
 
         Reviewed by Martin Robinson.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 131a0284d1e5cfc148b42d195675e3bf21f0d283..27debaef9b62a4ee782f3ac4826f3334fa56805e 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -34,12 +34,10 @@ 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
-WebKit2 := $(srcdir)/WebKit2
 
 # Libraries and support components
 bin_PROGRAMS :=
@@ -71,7 +69,6 @@ webkitgtk_cppflags :=
 webkitgtk_gdom_built_sources :=
 webkitgtk_built_sources :=
 webkitgtk_built_nosources :=
-webkit2_built_sources :=
 global_cppflags :=
 global_cflags :=
 global_cxxflags :=
@@ -206,15 +203,10 @@ EXTRA_DIST += \
 # Include module makefiles
 include JavaScriptCore/GNUmakefile.am
 include WebCore/GNUmakefile.am
-# Include module makefiles based on webkit arch
-if ENABLE_WEBKIT2
-include WebKit2/GNUmakefile.am
-else  #ENABLE_WEBKIT2
 include WebKit/gtk/GNUmakefile.am
 include WebCore/bindings/gobject/GNUmakefile.am
 include WebKitTools/GNUmakefile.am
 include WebKit/gtk/po/GNUmakefile.am
-endif  #ENABLE_WEBKIT2
 
 # Autogenerated sources
 BUILT_SOURCES += \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 731eb004190ffaaf7efec15c877eb6a79bc3dcd4..def6d33999410a31c19f9cf3fcd3fa82136e9d47 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r74117.
+        http://trac.webkit.org/changeset/74117
+        https://bugs.webkit.org/show_bug.cgi?id=51113
+
+        This broke the GTK1 build. (Requested by mrobinson on
+        #webkit).
+
+        * GNUmakefile.am:
+        * platform/network/soup/cache/webkit/soup-cache.h:
+
 2010-12-15  Jian Li  <jianli@chromium.org>
 
         Unreviewed. Fixed a clang compiling error by making the forward
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 5ad157abf063c4c137bbe575538b2fffa05a12ca..cb36e3190d8128e0786c07f7c722fb09869c9c8b 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -7,10 +7,10 @@ WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in
 webcore_cppflags += \
        -I$(srcdir)/WebCore \
        -I$(srcdir)/WebCore/accessibility \
-       -I$(srcdir)/WebCore/bindings \
        -I$(srcdir)/WebCore/bindings/generic \
        -I$(srcdir)/WebCore/bindings/js \
        -I$(srcdir)/WebCore/bindings/js/specialization \
+       -I$(srcdir)/WebCore/bindings/gobject \
        -I$(srcdir)/WebCore/bridge \
        -I$(srcdir)/WebCore/bridge/c \
        -I$(srcdir)/WebCore/bridge/jni/jsc \
@@ -686,6 +686,21 @@ webcore_sources += \
        WebCore/bindings/generic/GenericBinding.h \
        WebCore/bindings/generic/RuntimeEnabledFeatures.cpp \
        WebCore/bindings/generic/RuntimeEnabledFeatures.h \
+       WebCore/bindings/gobject/ConvertToUTF8String.cpp \
+       WebCore/bindings/gobject/ConvertToUTF8String.h \
+       WebCore/bindings/gobject/DOMObjectCache.cpp \
+       WebCore/bindings/gobject/DOMObjectCache.h \
+       WebCore/bindings/gobject/GObjectEventListener.cpp \
+       WebCore/bindings/gobject/GObjectEventListener.h \
+       WebCore/bindings/gobject/WebKitDOMBinding.cpp \
+       WebCore/bindings/gobject/WebKitDOMBinding.h \
+       WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \
+       WebCore/bindings/gobject/WebKitDOMEventTarget.h \
+       WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \
+       WebCore/bindings/gobject/WebKitDOMObject.cpp \
+       WebCore/bindings/gobject/WebKitDOMObject.h \
+       WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \
+       WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h \
        WebCore/bindings/js/CachedScriptSourceProvider.h \
        WebCore/bindings/js/DOMObjectHashTableMap.cpp \
        WebCore/bindings/js/DOMObjectHashTableMap.h \
@@ -3816,6 +3831,7 @@ webcoregtk_sources += \
        WebCore/platform/text/gtk/TextBreakIteratorGtk.cpp
 endif
 
+
 # ---
 # Channel mesaging support
 # ---
diff --git a/WebCore/platform/network/soup/cache/webkit/soup-cache.h b/WebCore/platform/network/soup/cache/webkit/soup-cache.h
index ccc924c43835e8faea7ea087c0844c7da0b7a547..e447cfcd1d1d78987f188dcb62608ec3b9bef03b 100644 (file)
--- a/WebCore/platform/network/soup/cache/webkit/soup-cache.h
+++ b/WebCore/platform/network/soup/cache/webkit/soup-cache.h
@@ -23,16 +23,12 @@
 #ifndef WEBKIT_SOUP_CACHE_H
 #define WEBKIT_SOUP_CACHE_H 1
 
-#ifdef G_OS_WIN32
-    #ifdef BUILDING_WEBKIT
-        #define WEBKIT_API __declspec(dllexport)
-    #else
-        #define WEBKIT_API __declspec(dllimport)
-    #endif
-    #define WEBKIT_OBSOLETE_API WEBKIT_API
+#if BUILDING_GTK__
+#include <webkit/webkitdefines.h>
 #else
-#define WEBKIT_API __attribute__((visibility("default")))
-#define WEBKIT_OBSOLETE_API WEBKIT_API __attribute__((deprecated))
+#ifndef WEBKIT_API
+#define WEBKIT_API
+#endif
 #endif
 
 #include <libsoup/soup-types.h>
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 6462beb530583b1bfd5d05006a7c62a03467483e..57cf7dfe17b61bc07ce19f40b0d71d0ce5bab982 100644 (file)
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r74117.
+        http://trac.webkit.org/changeset/74117
+        https://bugs.webkit.org/show_bug.cgi?id=51113
+
+        This broke the GTK1 build. (Requested by mrobinson on
+        #webkit).
+
+        * GNUmakefile.am:
+
 2010-12-15  Amruth Raj  <amruthraj@motorola.com> and Ravi Phaneendra Kasibhatla  <ravi.kasibhatla@motorola.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/GNUmakefile.am b/WebKit/gtk/GNUmakefile.am
index d6abf4ac42987b23ff7ff9d72a06ea6f33e20c17..dd4695910fea496876f4fda8e9ddd0ae96a77c24 100644 (file)
--- a/WebKit/gtk/GNUmakefile.am
+++ b/WebKit/gtk/GNUmakefile.am
@@ -154,19 +154,6 @@ webkitgtk_built_sources += \
 BUILT_SOURCES += $(webkitgtk_built_sources)
 
 webkitgtk_sources += \
-       WebCore/bindings/gobject/ConvertToUTF8String.cpp \
-       WebCore/bindings/gobject/ConvertToUTF8String.h \
-       WebCore/bindings/gobject/GObjectEventListener.cpp \
-       WebCore/bindings/gobject/GObjectEventListener.h \
-       WebCore/bindings/gobject/WebKitDOMBinding.cpp \
-       WebCore/bindings/gobject/WebKitDOMBinding.h \
-       WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \
-       WebCore/bindings/gobject/WebKitDOMEventTarget.h \
-       WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \
-       WebCore/bindings/gobject/WebKitDOMObject.cpp \
-       WebCore/bindings/gobject/WebKitDOMObject.h \
-       WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \
-       WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h \
        WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
        WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
        WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0be1e9afba8a5ac66449e841649838282227c10c..2abc126370ccb1e874f37e4f36c3a7660bba01bd 100644 (file)
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r74117.
+        http://trac.webkit.org/changeset/74117
+        https://bugs.webkit.org/show_bug.cgi?id=51113
+
+        This broke the GTK1 build. (Requested by mrobinson on
+        #webkit).
+
+        * GNUmakefile.am: Removed.
+        * Scripts/generate-forwarding-headers.pl:
+        * WebKit2Prefix.h:
+        * gtk/webkit2.pc.in: Removed.
+
 2010-12-15  Amruth Raj  <amruthraj@motorola.com> and Ravi Kasibhatla  <ravi.kasibhatla@motorola.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit2/GNUmakefile.am b/WebKit2/GNUmakefile.am
deleted file mode 100644 (file)
index 2bb4c41..0000000
--- a/WebKit2/GNUmakefile.am
+++ /dev/null
@@ -1,686 +0,0 @@
-
-webkit2_sources :=
-
-# WebKit2 Convenience libraries
-noinst_LTLIBRARIES += \
-       libWebKit2.la
-
-libWebKit2_ladir = $(prefix)/include/webkit2-@WEBKITGTK_API_VERSION@/WebKit2
-libWebKit2_la_HEADERS = \
-       $(WebKit2)/Shared/API/c/WKArray.h \
-       $(WebKit2)/Shared/API/c/WKBase.h \
-       $(WebKit2)/Shared/API/c/WKCertificateInfo.h \
-       $(WebKit2)/Shared/API/c/WKData.h \
-       $(WebKit2)/Shared/API/c/WKDictionary.h \
-       $(WebKit2)/Shared/API/c/WKError.h \
-       $(WebKit2)/Shared/API/c/WKEvent.h \
-       $(WebKit2)/Shared/API/c/WKGeometry.h \
-       $(WebKit2)/Shared/API/c/WKMutableArray.h \
-       $(WebKit2)/Shared/API/c/WKMutableDictionary.h \
-       $(WebKit2)/Shared/API/c/WKNumber.h \
-       $(WebKit2)/Shared/API/c/WKSerializedScriptValue.h \
-       $(WebKit2)/Shared/API/c/WKSerializedScriptValuePrivate.h \
-       $(WebKit2)/Shared/API/c/WKSharedAPICast.h \
-       $(WebKit2)/Shared/API/c/WKString.h \
-       $(WebKit2)/Shared/API/c/WKStringPrivate.h \
-       $(WebKit2)/Shared/API/c/WKType.h \
-       $(WebKit2)/Shared/API/c/WKURL.h \
-       $(WebKit2)/Shared/API/c/WKURLRequest.h \
-       $(WebKit2)/Shared/API/c/WKURLResponse.h \
-       $(WebKit2)/Shared/API/c/WKUserContentURLPattern.h \
-       $(WebKit2)/Shared/API/c/gtk/WKBaseGtk.h \
-       $(WebKit2)/UIProcess/API/cpp/WKRetainPtr.h \
-       $(WebKit2)/UIProcess/API/C/WebKit2.h \
-       $(WebKit2)/UIProcess/API/C/WKAPICast.h \
-       $(WebKit2)/UIProcess/API/C/WKBackForwardList.h \
-       $(WebKit2)/UIProcess/API/C/WKBackForwardListItem.h \
-       $(WebKit2)/UIProcess/API/C/WKContext.h \
-       $(WebKit2)/UIProcess/API/C/WKContextPrivate.h \
-       $(WebKit2)/UIProcess/API/C/WKFormSubmissionListener.h \
-       $(WebKit2)/UIProcess/API/C/WKFrame.h \
-       $(WebKit2)/UIProcess/API/C/WKFramePolicyListener.h \
-       $(WebKit2)/UIProcess/API/C/WKNativeEvent.h \
-       $(WebKit2)/UIProcess/API/C/WKNavigationData.h \
-       $(WebKit2)/UIProcess/API/C/WKPage.h \
-       $(WebKit2)/UIProcess/API/C/WKPageNamespace.h \
-       $(WebKit2)/UIProcess/API/C/WKPagePrivate.h \
-       $(WebKit2)/UIProcess/API/C/WKPreferences.h \
-       $(WebKit2)/UIProcess/API/C/WKPreferencesPrivate.h \
-       $(WebKit2)/UIProcess/API/C/gtk/WKAPICastiGtk.h \
-       $(WebKit2)/UIProcess/API/C/gtk/WKView.h
-
-nodist_libWebKit2_la_SOURCES = \
-       $(webkit2_built_sources)
-
-libWebKit2_la_SOURCES = \
-       $(webkit2_sources)
-
-libWebKit2_la_CPPFLAGS = \
-       -fno-strict-aliasing \
-       $(global_cppflags) \
-       -include $(srcdir)/WebKit2/WebKit2Prefix.h \
-       -I$(srcdir)/WebKit2 \
-       -I$(srcdir)/WebKit2/gtk \
-       -I$(srcdir)/WebKit2/Platform \
-       -I$(srcdir)/WebKit2/Platform/CoreIPC \
-       -I$(srcdir)/WebKit2/Platform/CoreIPC/gtk \
-       -I$(srcdir)/WebKit2/Platform/gtk \
-       -I$(srcdir)/WebKit2/PluginProcess \
-       -I$(srcdir)/WebKit2/Shared \
-       -I$(srcdir)/WebKit2/Shared/API \
-       -I$(srcdir)/WebKit2/Shared/API/c \
-       -I$(srcdir)/WebKit2/Shared/API/c/gtk \
-       -I$(srcdir)/WebKit2/Shared/CoreIPCSupport \
-       -I$(srcdir)/WebKit2/Shared/gtk \
-       -I$(srcdir)/WebKit2/UIProcess \
-       -I$(srcdir)/WebKit2/UIProcess/API \
-       -I$(srcdir)/WebKit2/UIProcess/API/C \
-       -I$(srcdir)/WebKit2/UIProcess/API/C/gtk \
-       -I$(srcdir)/WebKit2/UIProcess/API/cpp \
-       -I$(srcdir)/WebKit2/UIProcess/gtk \
-       -I$(srcdir)/WebKit2/UIProcess/Launcher \
-       -I$(srcdir)/WebKit2/UIProcess/Launcher/gtk \
-       -I$(srcdir)/WebKit2/UIProcess/Plugins \
-       -I$(srcdir)/WebKit2/UIProcess/Plugins/gtk \
-       -I$(srcdir)/WebKit2/WebProcess \
-       -I$(srcdir)/WebKit2/WebProcess/gtk \
-       -I$(srcdir)/WebKit2/WebProcess/InjectedBundle \
-       -I$(srcdir)/WebKit2/WebProcess/InjectedBundle/API \
-       -I$(srcdir)/WebKit2/WebProcess/InjectedBundle/API/c \
-       -I$(srcdir)/WebKit2/WebProcess/InjectedBundle/DOM \
-       -I$(srcdir)/WebKit2/WebProcess/InjectedBundle/gtk \
-       -I$(srcdir)/WebKit2/WebProcess/Launching \
-       -I$(srcdir)/WebKit2/WebProcess/Plugins \
-       -I$(srcdir)/WebKit2/WebProcess/Plugins/Netscape \
-       -I$(srcdir)/WebKit2/WebProcess/Plugins/Netscape/gtk \
-       -I$(srcdir)/WebKit2/WebProcess/WebCoreSupport \
-       -I$(srcdir)/WebKit2/WebProcess/WebCoreSupport/gtk \
-       -I$(srcdir)/WebKit2/WebProcess/WebPage \
-       -I$(srcdir)/WebKit2/WebProcess/WebPage/gtk \
-       -I$(top_builddir)/DerivedSources/WebKit2 \
-       -I$(top_builddir)/DerivedSources/WebKit2/include \
-       -I$(top_builddir)/DerivedSources/WebKit2/include/JavaScriptCore \
-       -I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
-       -I$(top_builddir)/DerivedSources/WebKit2/include/WebKit2 \
-       $(webcore_cppflags) \
-       $(webcoregtk_cppflags) \
-       $(javascriptcore_cppflags)
-
-libWebKit2_la_CXXFLAGS = \
-       $(global_cxxflags) \
-       $(libWebKit2_la_CFLAGS)
-
-libWebKit2_la_CFLAGS = \
-       $(global_cflags) \
-       $(COVERAGE_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(GTK_CFLAGS) \
-       $(LIBSOUP_CFLAGS) \
-       $(UNICODE_CFLAGS) \
-       $(XT_CFLAGS)
-
-libWebKit2_la_LIBADD = \
-       -lpthread \
-       $(CAIRO_LIBS) \
-       $(COVERAGE_LDFLAGS) \
-       $(GLIB_LIBS) \
-       $(GTK_LIBS) \
-       $(LIBSOUP_LIBS) \
-       $(UNICODE_LIBS) \
-       $(XT_LIBS)
-
-# Shared libraries
-lib_LTLIBRARIES += \
-       libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
-
-nodist_EXTRA_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-       $(webcore_built_nosources)
-
-nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-       $(webcore_built_sources)
-
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-       $(webcore_sources) \
-       $(webcoregtk_sources)
-
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
-       $(global_cxxflags)
-
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
-       $(global_cflags)
-
-# When building WebCore, 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.
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
-       -DBUILDING_WEBKIT \
-       -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-       -DDATA_DIR=\"${datadir}\" \
-       $(global_cppflags) \
-       $(webcore_cppflags) \
-       $(webcoregtk_cppflags) \
-       $(javascriptcore_cppflags) \
-       -fno-strict-aliasing \
-       $(HILDON_CPPFLAGS) \
-       $(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)
-
-# For the Gtk port we want to use XP_UNIX both in X11 and Mac
-if !TARGET_WIN32
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \
-       -DXP_UNIX
-endif
-
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
-       -version-info @LIBWEBKITGTK_VERSION@ \
-       $(version_script) \
-       $(no_undefined)
-
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
-       -lpthread \
-       libJavaScriptCore.la \
-       libWebKit2.la \
-       $(GSTREAMER_LIBS) \
-       $(GTK_LIBS) \
-       $(HILDON_LIBS) \
-       $(JPEG_LIBS) \
-       $(LIBSOUP_LIBS) \
-       $(LIBXML_LIBS) \
-       $(LIBXSLT_LIBS) \
-       $(PANGO_LIBS) \
-       $(PNG_LIBS) \
-       $(SQLITE3_LIBS) \
-       $(UNICODE_LIBS) \
-       $(XT_LIBS)
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = WebKit2/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
-
-# WebKit2 specific variables
-webkit2_sources += \
-       WebKit2/Platform/CoreIPC/ArgumentCoder.h \
-       WebKit2/Platform/CoreIPC/ArgumentCoders.h \
-       WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp \
-       WebKit2/Platform/CoreIPC/ArgumentDecoder.h \
-       WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp \
-       WebKit2/Platform/CoreIPC/ArgumentEncoder.h \
-       WebKit2/Platform/CoreIPC/Arguments.h \
-       WebKit2/Platform/CoreIPC/Attachment.cpp \
-       WebKit2/Platform/CoreIPC/Attachment.h \
-       WebKit2/Platform/CoreIPC/BinarySemaphore.cpp \
-       WebKit2/Platform/CoreIPC/BinarySemaphore.h \
-       WebKit2/Platform/CoreIPC/Connection.cpp \
-       WebKit2/Platform/CoreIPC/Connection.h \
-       WebKit2/Platform/CoreIPC/CoreIPCMessageKinds.h \
-       WebKit2/Platform/CoreIPC/DataReference.cpp \
-       WebKit2/Platform/CoreIPC/DataReference.h \
-       WebKit2/Platform/CoreIPC/gtk/ConnectionGtk.cpp \
-       WebKit2/Platform/CoreIPC/HandleMessage.h \
-       WebKit2/Platform/CoreIPC/MessageID.h \
-       WebKit2/Platform/gtk/ModuleGtk.cpp \
-       WebKit2/Platform/gtk/RunLoopGtk.cpp \
-       WebKit2/Platform/gtk/SharedMemoryGtk.cpp \
-       WebKit2/Platform/gtk/WorkQueueGtk.cpp \
-       WebKit2/Platform/Logging.cpp \
-       WebKit2/Platform/Logging.h \
-       WebKit2/Platform/Module.cpp \
-       WebKit2/Platform/Module.h \
-       WebKit2/Platform/PlatformProcessIdentifier.h \
-       WebKit2/Platform/RunLoop.cpp \
-       WebKit2/Platform/RunLoop.h \
-       WebKit2/Platform/SharedMemory.h \
-       WebKit2/Platform/WorkItem.h \
-       WebKit2/Platform/WorkQueue.cpp \
-       WebKit2/Platform/WorkQueue.h \
-       WebKit2/PluginProcess/PluginControllerProxy.cpp \
-       WebKit2/PluginProcess/PluginControllerProxy.h \
-       WebKit2/PluginProcess/PluginProcess.cpp \
-       WebKit2/PluginProcess/PluginProcess.h \
-       WebKit2/PluginProcess/PluginProcessMain.h \
-       WebKit2/PluginProcess/WebProcessConnection.cpp \
-       WebKit2/PluginProcess/WebProcessConnection.h \
-       WebKit2/Shared/API/c/gtk/WKBaseGtk.h \
-       WebKit2/Shared/APIClient.h \
-       WebKit2/Shared/API/c/WKArray.cpp \
-       WebKit2/Shared/API/c/WKArray.h \
-       WebKit2/Shared/API/c/WKBase.h \
-       WebKit2/Shared/API/c/WKCertificateInfo.cpp \
-       WebKit2/Shared/API/c/WKCertificateInfo.h \
-       WebKit2/Shared/API/c/WKData.cpp \
-       WebKit2/Shared/API/c/WKData.h \
-       WebKit2/Shared/API/c/WKDictionary.cpp \
-       WebKit2/Shared/API/c/WKDictionary.h \
-       WebKit2/Shared/API/c/WKError.cpp \
-       WebKit2/Shared/API/c/WKError.h \
-       WebKit2/Shared/API/c/WKEvent.h \
-       WebKit2/Shared/API/c/WKGeometry.h \
-       WebKit2/Shared/API/c/WKMutableArray.cpp \
-       WebKit2/Shared/API/c/WKMutableArray.h \
-       WebKit2/Shared/API/c/WKMutableDictionary.cpp \
-       WebKit2/Shared/API/c/WKMutableDictionary.h \
-       WebKit2/Shared/API/c/WKNumber.cpp \
-       WebKit2/Shared/API/c/WKNumber.h \
-       WebKit2/Shared/API/c/WKSerializedScriptValue.cpp \
-       WebKit2/Shared/API/c/WKSerializedScriptValue.h \
-       WebKit2/Shared/API/c/WKSerializedScriptValuePrivate.h \
-       WebKit2/Shared/API/c/WKSharedAPICast.h \
-       WebKit2/Shared/API/c/WKString.cpp \
-       WebKit2/Shared/API/c/WKString.h \
-       WebKit2/Shared/API/c/WKStringPrivate.h \
-       WebKit2/Shared/API/c/WKType.cpp \
-       WebKit2/Shared/API/c/WKType.h \
-       WebKit2/Shared/API/c/WKURL.cpp \
-       WebKit2/Shared/API/c/WKURL.h \
-       WebKit2/Shared/API/c/WKURLRequest.cpp \
-       WebKit2/Shared/API/c/WKURLRequest.h \
-       WebKit2/Shared/API/c/WKURLResponse.cpp \
-       WebKit2/Shared/API/c/WKURLResponse.h \
-       WebKit2/Shared/API/c/WKUserContentURLPattern.cpp \
-       WebKit2/Shared/API/c/WKUserContentURLPattern.h \
-       WebKit2/Shared/APIObject.h \
-       WebKit2/Shared/BackingStore.cpp \
-       WebKit2/Shared/BackingStore.h \
-       WebKit2/Shared/CacheModel.h \
-       WebKit2/Shared/CommandLine.h \
-       WebKit2/Shared/CoreIPCSupport/DrawingAreaMessageKinds.h \
-       WebKit2/Shared/CoreIPCSupport/DrawingAreaProxyMessageKinds.h \
-       WebKit2/Shared/CoreIPCSupport/InjectedBundleMessageKinds.h \
-       WebKit2/Shared/CoreIPCSupport/WebContextMessageKinds.h \
-       WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h \
-       WebKit2/Shared/CoreIPCSupport/WebProcessProxyMessageKinds.h \
-       WebKit2/Shared/DrawingAreaBase.h \
-       WebKit2/Shared/FindOptions.h \
-       WebKit2/Shared/FontSmoothingLevel.h \
-       WebKit2/Shared/gtk/BackingStoreGtk.cpp \
-       WebKit2/Shared/gtk/NativeWebKeyboardEventGtk.cpp \
-       WebKit2/Shared/gtk/PlatformCertificateInfo.h \
-       WebKit2/Shared/gtk/UpdateChunk.cpp \
-       WebKit2/Shared/gtk/UpdateChunk.h \
-       WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp \
-       WebKit2/Shared/gtk/WebEventFactory.cpp \
-       WebKit2/Shared/gtk/WebEventFactory.h \
-       WebKit2/Shared/ImmutableArray.cpp \
-       WebKit2/Shared/ImmutableArray.h \
-       WebKit2/Shared/ImmutableDictionary.cpp \
-       WebKit2/Shared/ImmutableDictionary.h \
-       WebKit2/Shared/MutableArray.cpp \
-       WebKit2/Shared/MutableArray.h \
-       WebKit2/Shared/MutableDictionary.cpp \
-       WebKit2/Shared/MutableDictionary.h \
-       WebKit2/Shared/NativeWebKeyboardEvent.h \
-       WebKit2/Shared/NotImplemented.h \
-       WebKit2/Shared/StringPairVector.h \
-       WebKit2/Shared/UserMessageCoders.h \
-       WebKit2/Shared/VisitedLinkTable.cpp \
-       WebKit2/Shared/VisitedLinkTable.h \
-       WebKit2/Shared/WebCertificateInfo.h \
-       WebKit2/Shared/WebCoreArgumentCoders.h \
-       WebKit2/Shared/WebData.h \
-       WebKit2/Shared/WebError.cpp \
-       WebKit2/Shared/WebError.h \
-       WebKit2/Shared/WebEventConversion.cpp \
-       WebKit2/Shared/WebEventConversion.h \
-       WebKit2/Shared/WebEvent.h \
-       WebKit2/Shared/WebNavigationDataStore.h \
-       WebKit2/Shared/WebNumber.h \
-       WebKit2/Shared/WebPageCreationParameters.cpp \
-       WebKit2/Shared/WebPageCreationParameters.h \
-       WebKit2/Shared/WebPopupItem.cpp \
-       WebKit2/Shared/WebPopupItem.h \
-       WebKit2/Shared/WebPreferencesStore.cpp \
-       WebKit2/Shared/WebPreferencesStore.h \
-       WebKit2/Shared/WebProcessCreationParameters.cpp \
-       WebKit2/Shared/WebProcessCreationParameters.h \
-       WebKit2/Shared/WebSerializedScriptValue.h \
-       WebKit2/Shared/WebString.h \
-       WebKit2/Shared/WebURL.h \
-       WebKit2/Shared/WebURLRequest.cpp \
-       WebKit2/Shared/WebURLRequest.h \
-       WebKit2/Shared/WebURLResponse.cpp \
-       WebKit2/Shared/WebURLResponse.h \
-       WebKit2/Shared/WebUserContentURLPattern.h \
-       WebKit2/UIProcess/API/C/gtk/WKAPICastGtk.h \
-       WebKit2/UIProcess/API/C/gtk/WKView.cpp \
-       WebKit2/UIProcess/API/C/gtk/WKView.h \
-       WebKit2/UIProcess/API/cpp/WKRetainPtr.h \
-       WebKit2/UIProcess/API/C/WebKit2.h \
-       WebKit2/UIProcess/API/C/WKAPICast.h \
-       WebKit2/UIProcess/API/C/WKBackForwardList.cpp \
-       WebKit2/UIProcess/API/C/WKBackForwardList.h \
-       WebKit2/UIProcess/API/C/WKBackForwardListItem.cpp \
-       WebKit2/UIProcess/API/C/WKBackForwardListItem.h \
-       WebKit2/UIProcess/API/C/WKContext.cpp \
-       WebKit2/UIProcess/API/C/WKContext.h \
-       WebKit2/UIProcess/API/C/WKContextPrivate.h \
-       WebKit2/UIProcess/API/C/WKFormSubmissionListener.cpp \
-       WebKit2/UIProcess/API/C/WKFormSubmissionListener.h \
-       WebKit2/UIProcess/API/C/WKFrame.cpp \
-       WebKit2/UIProcess/API/C/WKFrame.h \
-       WebKit2/UIProcess/API/C/WKFramePolicyListener.cpp \
-       WebKit2/UIProcess/API/C/WKFramePolicyListener.h \
-       WebKit2/UIProcess/API/C/WKNativeEvent.h \
-       WebKit2/UIProcess/API/C/WKNavigationData.cpp \
-       WebKit2/UIProcess/API/C/WKNavigationData.h \
-       WebKit2/UIProcess/API/C/WKPage.cpp \
-       WebKit2/UIProcess/API/C/WKPage.h \
-       WebKit2/UIProcess/API/C/WKPageNamespace.cpp \
-       WebKit2/UIProcess/API/C/WKPageNamespace.h \
-       WebKit2/UIProcess/API/C/WKPagePrivate.h \
-       WebKit2/UIProcess/API/C/WKPreferences.cpp \
-       WebKit2/UIProcess/API/C/WKPreferences.h \
-       WebKit2/UIProcess/API/C/WKPreferencesPrivate.cpp \
-       WebKit2/UIProcess/API/C/WKPreferencesPrivate.h \
-       WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp \
-       WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h \
-       WebKit2/UIProcess/DrawingAreaProxy.cpp \
-       WebKit2/UIProcess/DrawingAreaProxy.h \
-       WebKit2/UIProcess/FindIndicator.cpp \
-       WebKit2/UIProcess/FindIndicator.h \
-       WebKit2/UIProcess/GenericCallback.h \
-       WebKit2/UIProcess/gtk/ChunkedUpdateDrawingAreaProxyGtk.cpp \
-       WebKit2/UIProcess/gtk/WebContextGtk.cpp \
-       WebKit2/UIProcess/gtk/WebView.cpp \
-       WebKit2/UIProcess/gtk/WebView.h \
-       WebKit2/UIProcess/gtk/WebViewInternal.cpp \
-       WebKit2/UIProcess/gtk/WebViewInternal.h \
-       WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp \
-       WebKit2/UIProcess/Launcher/gtk/ThreadLauncherGtk.cpp \
-       WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
-       WebKit2/UIProcess/Launcher/ProcessLauncher.h \
-       WebKit2/UIProcess/Launcher/ThreadLauncher.cpp \
-       WebKit2/UIProcess/Launcher/ThreadLauncher.h \
-       WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp \
-       WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h \
-       WebKit2/UIProcess/PageClient.h \
-       WebKit2/UIProcess/Plugins/gtk/PluginInfoStoreGtk.cpp \
-       WebKit2/UIProcess/Plugins/PluginInfoStore.cpp \
-       WebKit2/UIProcess/Plugins/PluginInfoStore.h \
-       WebKit2/UIProcess/Plugins/PluginProcessManager.cpp \
-       WebKit2/UIProcess/Plugins/PluginProcessManager.h \
-       WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp \
-       WebKit2/UIProcess/Plugins/PluginProcessProxy.h \
-       WebKit2/UIProcess/ProcessModel.h \
-       WebKit2/UIProcess/ResponsivenessTimer.cpp \
-       WebKit2/UIProcess/ResponsivenessTimer.h \
-       WebKit2/UIProcess/VisitedLinkProvider.cpp \
-       WebKit2/UIProcess/VisitedLinkProvider.h \
-       WebKit2/UIProcess/WebBackForwardList.cpp \
-       WebKit2/UIProcess/WebBackForwardList.h \
-       WebKit2/UIProcess/WebBackForwardListItem.cpp \
-       WebKit2/UIProcess/WebBackForwardListItem.h \
-       WebKit2/UIProcess/WebContext.cpp \
-       WebKit2/UIProcess/WebContext.h \
-       WebKit2/UIProcess/WebContextInjectedBundleClient.cpp \
-       WebKit2/UIProcess/WebContextInjectedBundleClient.h \
-       WebKit2/UIProcess/WebContextUserMessageCoders.h \
-       WebKit2/UIProcess/WebEditCommandProxy.cpp \
-       WebKit2/UIProcess/WebEditCommandProxy.h \
-       WebKit2/UIProcess/WebFindClient.cpp \
-       WebKit2/UIProcess/WebFindClient.h \
-       WebKit2/UIProcess/WebFormClient.cpp \
-       WebKit2/UIProcess/WebFormClient.h \
-       WebKit2/UIProcess/WebFormSubmissionListenerProxy.cpp \
-       WebKit2/UIProcess/WebFormSubmissionListenerProxy.h \
-       WebKit2/UIProcess/WebFrameListenerProxy.cpp \
-       WebKit2/UIProcess/WebFrameListenerProxy.h \
-       WebKit2/UIProcess/WebFramePolicyListenerProxy.cpp \
-       WebKit2/UIProcess/WebFramePolicyListenerProxy.h \
-       WebKit2/UIProcess/WebFrameProxy.cpp \
-       WebKit2/UIProcess/WebFrameProxy.h \
-       WebKit2/UIProcess/WebHistoryClient.cpp \
-       WebKit2/UIProcess/WebHistoryClient.h \
-       WebKit2/UIProcess/WebLoaderClient.cpp \
-       WebKit2/UIProcess/WebLoaderClient.h \
-       WebKit2/UIProcess/WebNavigationData.cpp \
-       WebKit2/UIProcess/WebNavigationData.h \
-       WebKit2/UIProcess/WebPageNamespace.cpp \
-       WebKit2/UIProcess/WebPageNamespace.h \
-       WebKit2/UIProcess/WebPageProxy.cpp \
-       WebKit2/UIProcess/WebPageProxy.h \
-       WebKit2/UIProcess/WebPolicyClient.cpp \
-       WebKit2/UIProcess/WebPolicyClient.h \
-       WebKit2/UIProcess/WebPopupMenuProxy.h \
-       WebKit2/UIProcess/WebPreferences.cpp \
-       WebKit2/UIProcess/WebPreferences.h \
-       WebKit2/UIProcess/WebProcessManager.cpp \
-       WebKit2/UIProcess/WebProcessManager.h \
-       WebKit2/UIProcess/WebProcessProxy.cpp \
-       WebKit2/UIProcess/WebProcessProxy.h \
-       WebKit2/UIProcess/WebUIClient.cpp \
-       WebKit2/UIProcess/WebUIClient.h \
-       WebKit2/WebKit2Prefix.cpp \
-       WebKit2/WebKit2Prefix.h \
-       WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp \
-       WebKit2/WebProcess/gtk/WebProcessMainGtk.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.cpp \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleHitTestResult.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInitialize.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.h \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp \
-       WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h \
-       WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp \
-       WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.h \
-       WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp \
-       WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h \
-       WebKit2/WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundle.h \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundleHitTestResult.h \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.h \
-       WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h \
-       WebKit2/WebProcess/Plugins/JSNPMethod.cpp \
-       WebKit2/WebProcess/Plugins/JSNPMethod.h \
-       WebKit2/WebProcess/Plugins/JSNPObject.cpp \
-       WebKit2/WebProcess/Plugins/JSNPObject.h \
-       WebKit2/WebProcess/Plugins/Netscape/gtk/NetscapePluginGtk.cpp \
-       WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp \
-       WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.h \
-       WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp \
-       WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h \
-       WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.cpp \
-       WebKit2/WebProcess/Plugins/Netscape/NetscapePluginModule.h \
-       WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp \
-       WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h \
-       WebKit2/WebProcess/Plugins/NPJSObject.cpp \
-       WebKit2/WebProcess/Plugins/NPJSObject.h \
-       WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp \
-       WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h \
-       WebKit2/WebProcess/Plugins/NPRuntimeUtilities.cpp \
-       WebKit2/WebProcess/Plugins/NPRuntimeUtilities.h \
-       WebKit2/WebProcess/Plugins/PluginController.h \
-       WebKit2/WebProcess/Plugins/Plugin.cpp \
-       WebKit2/WebProcess/Plugins/Plugin.h \
-       WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp \
-       WebKit2/WebProcess/Plugins/PluginProcessConnection.h \
-       WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp \
-       WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h \
-       WebKit2/WebProcess/Plugins/PluginProxy.cpp \
-       WebKit2/WebProcess/Plugins/PluginProxy.h \
-       WebKit2/WebProcess/Plugins/PluginView.cpp \
-       WebKit2/WebProcess/Plugins/PluginView.h \
-       WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp \
-       WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h \
-       WebKit2/WebProcess/WebCoreSupport/WebBackForwardControllerClient.cpp \
-       WebKit2/WebProcess/WebCoreSupport/WebBackForwardControllerClient.h \
-       WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \
-       WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \
-       WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp \
-       WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.h \
-       WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp \
-       WebKit2/WebProcess/WebCoreSupport/WebDragClient.h \
-       WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp \
-       WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h \
-       WebKit2/WebProcess/WebCoreSupport/WebErrors.h \
-       WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp \
-       WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h \
-       WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp \
-       WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h \
-       WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp \
-       WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h \
-       WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.cpp \
-       WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h \
-       WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp \
-       WebKit2/WebProcess/WebCoreSupport/WebSearchPopupMenu.h \
-       WebKit2/WebProcess/WebKitMain.cpp \
-       WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp \
-       WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h \
-       WebKit2/WebProcess/WebPage/DrawingArea.cpp \
-       WebKit2/WebProcess/WebPage/DrawingArea.h \
-       WebKit2/WebProcess/WebPage/FindController.cpp \
-       WebKit2/WebProcess/WebPage/FindController.h \
-       WebKit2/WebProcess/WebPage/FindPageOverlay.cpp \
-       WebKit2/WebProcess/WebPage/FindPageOverlay.h \
-       WebKit2/WebProcess/WebPage/gtk/ChunkedUpdateDrawingAreaGtk.cpp \
-       WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp \
-       WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.cpp \
-       WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h \
-       WebKit2/WebProcess/WebPage/PageOverlay.cpp \
-       WebKit2/WebProcess/WebPage/PageOverlay.h \
-       WebKit2/WebProcess/WebPage/WebBackForwardListProxy.cpp \
-       WebKit2/WebProcess/WebPage/WebBackForwardListProxy.h \
-       WebKit2/WebProcess/WebPage/WebEditCommand.cpp \
-       WebKit2/WebProcess/WebPage/WebEditCommand.h \
-       WebKit2/WebProcess/WebPage/WebFrame.cpp \
-       WebKit2/WebProcess/WebPage/WebFrame.h \
-       WebKit2/WebProcess/WebPage/WebPage.cpp \
-       WebKit2/WebProcess/WebPage/WebPage.h \
-       WebKit2/WebProcess/WebProcess.cpp \
-       WebKit2/WebProcess/WebProcess.h \
-       WebKit2/WebProcess/WebProcessMain.h
-
-webkit2_built_sources += \
-       DerivedSources/WebKit2/DownloadProxyMessages.h \
-       DerivedSources/WebKit2/DownloadProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
-       DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
-       DerivedSources/WebKit2/PluginControllerProxyMessages.h \
-       DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/PluginProcessMessages.h \
-       DerivedSources/WebKit2/PluginProcessMessageReceiver.cpp \
-       DerivedSources/WebKit2/PluginProcessProxyMessages.h \
-       DerivedSources/WebKit2/PluginProcessProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/PluginProxyMessages.h \
-       DerivedSources/WebKit2/PluginProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebContextMessages.h \
-       DerivedSources/WebKit2/WebContextMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebInspectorMessages.h \
-       DerivedSources/WebKit2/WebInspectorMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebInspectorProxyMessages.h \
-       DerivedSources/WebKit2/WebInspectorProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebPageMessages.h \
-       DerivedSources/WebKit2/WebPageMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebPageProxyMessages.h \
-       DerivedSources/WebKit2/WebPageProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebProcessMessages.h \
-       DerivedSources/WebKit2/WebProcessMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebProcessProxyMessages.h \
-       DerivedSources/WebKit2/WebProcessProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebProcessConnectionMessages.h \
-       DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp
-
-BUILT_SOURCES += \
-       $(webkit2_built_sources) \
-       generate-webkit2-forwarding-headers
-
-ForwardingHeaders := $(GENSOURCES_WEBKIT2)/include
-generate-webkit2-forwarding-headers: $(srcdir)/WebKitTools/Scripts/generate-forwarding-headers.pl $(webkit2_sources)
-       $(AM_V_at)$(mkdir_p) $(ForwardingHeaders)/JavaScriptCore
-       $(AM_V_at)$(mkdir_p) $(ForwardingHeaders)/WebCore
-       $(AM_V_at)$(mkdir_p) $(ForwardingHeaders)/WebKit2
-       $(AM_V_GEN)$(PERL) $< $(WebKit2) $(ForwardingHeaders) gtk soup 
-
-vpath %.messages.in = \
-       $(WebKit2)/PluginProcess \
-       $(WebKit2)/Shared/Plugins \
-       $(WebKit2)/UIProcess \
-       $(WebKit2)/UIProcess/Downloads \
-       $(WebKit2)/UIProcess/Plugins \
-       $(WebKit2)/WebProcess \
-       $(WebKit2)/WebProcess/Plugins \
-       $(WebKit2)/WebProcess/WebPage 
-
-message_gen_scripts = \
-       $(WebKit2)/Scripts/generate-message-receiver.py \
-       $(WebKit2)/Scripts/generate-messages-header.py \
-       $(WebKit2)/Scripts/webkit2/__init__.py \
-       $(WebKit2)/Scripts/webkit2/messages.py
-
-# Message header generation
-DerivedSources/WebKit2/%MessageReceiver.cpp: %.messages.in $(message_gen_scripts)
-       $(AM_V_GEN)$(PYTHON) $(srcdir)/WebKit2/Scripts/generate-message-receiver.py $< > $@
-
-DerivedSources/WebKit2/%Messages.h: %.messages.in $(message_gen_scripts)
-       $(AM_V_GEN)$(PYTHON) $(srcdir)/WebKit2/Scripts/generate-messages-header.py $< > $@
-
-CLEANFILES += \
-       $(BUILT_SOURCES) \
-       $(top_builddir)/WebKit2/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \
-       $(top_builddir)/Programs/WebKitWebProcess
-
-# WebKitWebProcess
-bin_PROGRAMS += \
-       Programs/WebKitWebProcess
-
-Programs_WebKitWebProcess_CPPFLAGS = \
-       -I$(srcdir)/WebKit2 \
-       -I$(srcdir)/WebKit2/UIProcess/API/C \
-       -I$(srcdir)/WebKit2/WebProcess/gtk \
-       -I$(top_builddir)/DerivedSources/WebKit2 \
-       -I$(top_builddir)/DerivedSources/WebKit2/include \
-       -I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
-       $(global_cppflags) \
-       $(javascriptcore_cppflags)
-
-Programs_WebKitWebProcess_CFLAGS = \
-       $(global_cflags) \
-       $(GTK_CFLAGS) \
-       $(LIBSOUP_CFLAGS)
-
-Programs_WebKitWebProcess_SOURCES = \
-       WebKit2/gtk/MainGtk.cpp
-
-Programs_WebKitWebProcess_LDADD = \
-       libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
-       $(GTK_LIBS) \
-       $(GLIB_LIBS) \
-       $(LIBSOUP_LIBS)
-
-Programs_WebKitWebProcess_LDFLAGS = \
-       -no-fast-install \
-       -no-install
diff --git a/WebKit2/Scripts/generate-forwarding-headers.pl b/WebKit2/Scripts/generate-forwarding-headers.pl
index 295f1124804c0a9a407ae8497c7f0217afcd2c11..d5abb5bb8b0780c4e17b106657bb3066288213fd 100755 (executable)
--- a/WebKit2/Scripts/generate-forwarding-headers.pl
+++ b/WebKit2/Scripts/generate-forwarding-headers.pl
@@ -47,18 +47,8 @@ my $outputDirectory = $ARGV[0];
 shift;
 my $platform  = $ARGV[0];
 
-my $network;
-if ($platform =~ "gtk") {
-    shift;
-    $network = $ARGV[0];
-}
-
 foreach my $prefix (@platformPrefixes) {
-    if ($platform =~ "gtk") {
-        push(@skippedPrefixes, $prefix) unless ($prefix =~ $platform or $prefix =~ $network);
-    } else {
-        push(@skippedPrefixes, $prefix) unless ($prefix =~ $platform);
-    }
+    push(@skippedPrefixes, $prefix) unless ($prefix =~ $platform);
 }
 
 foreach (@frameworks) {
diff --git a/WebKit2/WebKit2Prefix.h b/WebKit2/WebKit2Prefix.h
index 8912e5a4f223664898f4907b6af436277fe250bf..bdfc1812c7741cb2d7bb01472e5426ca07023cbf 100644 (file)
--- a/WebKit2/WebKit2Prefix.h
+++ b/WebKit2/WebKit2Prefix.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,9 +23,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */ 
 
-#if defined (BUILDING_GTK__)
-#include <WebCore/config.h>
-#endif /* defined (BUILDING_GTK__) */
 #include <wtf/Platform.h>
 #include <wtf/DisallowCType.h>
 #ifdef __cplusplus
@@ -113,3 +109,4 @@ static const type& name() \
 #endif
 
 #endif /* defined(WIN32) || defined(_WIN32) */
+
diff --git a/WebKit2/gtk/webkit2.pc.in b/WebKit2/gtk/webkit2.pc.in
deleted file mode 100644 (file)
index 6eeee80..0000000
--- a/WebKit2/gtk/webkit2.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: WebKit2
-Description: Web content engine for GTK+
-Version: @VERSION@
-Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4
-Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
-Cflags: -I${includedir}/webkit2-@WEBKITGTK_API_VERSION@ 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e26fad2c201679eafdbddaa810999081d957ec7d..37d290abf402eafd2225030d16dc0378e691b41a 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r74117.
+        http://trac.webkit.org/changeset/74117
+        https://bugs.webkit.org/show_bug.cgi?id=51113
+
+        This broke the GTK1 build. (Requested by mrobinson on
+        #webkit).
+
+        * Scripts/webkitdirs.pm:
+
 2010-12-15  Lucas Forschler  <lforschler@apple.com>
 
         Reviewed by Stephanie Lewis.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index d9bc3ddbd36e4062eb3b4d119fb2810fda6b6bfa..9d47e8c004075dab5bc74898e6c197842d522d2f 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1352,8 +1352,6 @@ sub buildAutotoolsProject($@)
             $makeArgs = $makeArgs . " " . $1;
         } elsif ($opt =~ /^--prefix=(.*)/i ) {
             $prefix = $1;
-        } elsif ($opt =~ /^--webkit2/i ) {
-            push @buildArgs, "--enable-webkit2";
         } else {
             push @buildArgs, $opt;
         }
diff --git a/configure.ac b/configure.ac
index e40db547ba5de54f230392a326b16493de2b1e5c..f73c2e8533343aeb4e69a1d7ae20e5035ef11082 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -902,23 +902,6 @@ if test "$enable_video" = "yes"; then
     html_flags=yes
 fi
 
-# WebKit2
-AC_MSG_CHECKING([whether to build Webkit2])
-AC_ARG_ENABLE(webkit2,
-            AC_HELP_STRING([--enable-webkit2],
-                [build webkit2 [default=no]]),
-                [], [enable_webkit2="no"])
-AC_MSG_RESULT([$enable_webkit2])
-if test "$enable_webkit2" = "yes"; then
-    # Turn on this macro by default. It is used in inttypes.h for defining macros used by webkit.
-    # In WebKit, this define is ensured by doing it before including config.h in any source file.
-    # In WebKit2, WebKit2Prefix.h is included as first header file, so we need to define this
-    # macro before actually WebKit2Prefix.h is included in any file.
-    AC_DEFINE([__STDC_FORMAT_MACROS],[1],[Turn on the __STDC_FORMAT_MACROS used in inttypes.h]),
-    WEBKITGTK_PC_NAME=${WEBKITGTK_PC_NAME}2
-    AC_SUBST([WEBKITGTK_PC_NAME])
-fi
-
 GTK_DOC_CHECK([1.10])
 
 # OS conditionals
@@ -993,37 +976,26 @@ AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_AUDIO],[test "$enable_web_audio" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
 AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
-AM_CONDITIONAL([ENABLE_WEBKIT2],[test "$enable_webkit2" = "yes"])
 
 # Gtk conditionals
 AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
 
+
 AC_CONFIG_FILES([
 GNUmakefile
-])
- 
-if test "$enable_webkit2" = "no"; then
-    AC_CONFIG_FILES([
-    WebKit/gtk/webkit/webkitversion.h
-    WebKit/gtk/docs/GNUmakefile
-    WebKit/gtk/docs/version.xml
-    ]
-    )
-
-    AC_CONFIG_FILES([
-    WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in
-    WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in
-    WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:WebKit/gtk/org.webkitgtk.gschema.xml.in
-    ]
-    ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
-    )
-else
-    AC_CONFIG_FILES([
-    WebKit2/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit2/gtk/webkit2.pc.in
-    ]
-    ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
-    )
-fi
+WebKit/gtk/webkit/webkitversion.h
+WebKit/gtk/docs/GNUmakefile
+WebKit/gtk/docs/version.xml
+]
+)
+
+AC_CONFIG_FILES([
+WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in
+WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in
+WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:WebKit/gtk/org.webkitgtk.gschema.xml.in
+]
+,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
+)
 
 AC_OUTPUT
 
@@ -1082,7 +1054,6 @@ GTK+ configuration:
  GDK target                                               : $with_target
  Hildon UI extensions                                     : $with_hildon
  Introspection support                                    : $enable_introspection
- WebKit2 support                                          : $enable_webkit2
 "
 if test "$with_unicode_backend" = "glib"; then
    echo "     >> WARNING: the glib-based unicode backend is slow and incomplete <<"
Mirror of the WebKit open source project from svn.webkit.org.