Build fixes for WebKit2. Ensure that all generated sources are

on nodist primaries, that they are on forward declared variables
so that BUILT_SOURCES is calculated properly and that zlib is
included during linking (for WOFF support).

.:

* GNUmakefile.am:
* Source/autotools/webkit.m4: Include test for zlib.

Source/WebKit/gtk:

* GNUmakefile.am:

Source/WebKit2:

* GNUmakefile.am:

Tools:

* WebKitTestRunner/GNUmakefile.am:

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

diff --git a/ChangeLog b/ChangeLog
index c2d7389ccf34f718b24dffd5bcb2c0d47ad8005f..09832dbf1de25e32ddb9bf49f633bdddfeefb207 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-15  Martin Robinson  <mrobinson@igalia.com>
+
+        Build fixes for WebKit2. Ensure that all generated sources are
+        on nodist primaries, that they are on forward declared variables
+        so that BUILT_SOURCES is calculated properly and that zlib is 
+        included during linking (for WOFF support).
+
+        * GNUmakefile.am:
+        * Source/autotools/webkit.m4: Include test for zlib.
+
 2011-07-15  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Build plugin process by default when building WebKit2

diff --git a/GNUmakefile.am b/GNUmakefile.am
index fb10790b1ea142b694f8c3fa8ea330e7f5a4a4dd..c9ec407882e7a09b119546304d694061a9106ae8 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -73,6 +73,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 :=

diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index 586771abbfabe40bfe95194f8dc89eb81fcfba4a..594639051ab0c8ffc97d1225347171d0b29b3b00 100644 (file)
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-15  Martin Robinson  <mrobinson@igalia.com>
+
+        Build fixes for WebKit2. Ensure that all generated sources are
+        on nodist primaries, that they are on forward declared variables
+        so that BUILT_SOURCES is calculated properly and that zlib is 
+        included during linking (for WOFF support).
+
+        * GNUmakefile.am:
+
 2011-07-14  Lukasz Slachciak  <l.slachciak@samsung.com>
 
         Reviewed by Gustavo Noronha.

diff --git a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am
index 51c7c7f4e68e6b20d5c4e0e2f83912a14025ca1f..476f72cbaf310f6f4ff5e04dcef4a5a3674cb587 100644 (file)
--- a/Source/WebKit/gtk/GNUmakefile.am
+++ b/Source/WebKit/gtk/GNUmakefile.am
@@ -71,7 +71,8 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPF
        $(LIBXSLT_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(UNICODE_CFLAGS) \
-       $(XT_CFLAGS)
+       $(XT_CFLAGS) \
+       $(ZLIB_CFLAGS)
 
 libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
        -version-info @LIBWEBKITGTK_VERSION@ \
@@ -107,7 +108,8 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBA
        $(XT_LIBS) \
        $(WINMM_LIBS) \
        $(SHLWAPI_LIBS) \
-       $(OLE32_LIBS)
+       $(OLE32_LIBS) \
+       $(ZLIB_LIBS)
 
 webkitgtk_static_h_api += \
        $(srcdir)/Source/WebKit/gtk/webkit/webkit.h \

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 1d10b6efb34b0bcef42dd6dc2bf3c442a3f7c72a..e8fd5f5dec06a5127e4bfb2f26f03194e55ba877 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-15  Martin Robinson  <mrobinson@igalia.com>
+
+        Build fixes for WebKit2. Ensure that all generated sources are
+        on nodist primaries, that they are on forward declared variables
+        so that BUILT_SOURCES is calculated properly and that zlib is 
+        included during linking (for WOFF support).
+
+        * GNUmakefile.am:
+
 2011-07-15  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 
         Upstream QtWebKit/N9 changes related to visibleContentRect

diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am
index 6051580da4f77792320ffb041de18dd9cd261c5a..c487c8fb6e4ec5354f92ce02a1b6609030332f52 100644 (file)
--- a/Source/WebKit2/GNUmakefile.am
+++ b/Source/WebKit2/GNUmakefile.am
@@ -69,8 +69,79 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEA
        $(WebKit2)/UIProcess/API/gtk/WebKitWebViewBase.h \
        $(WebKit2)/UIProcess/API/gtk/webkit/webkit.h
 
-nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-       $(webkit2_built_sources)
+webkit2_built_sources += \
+       DerivedSources/WebKit2/AuthenticationManagerMessageReceiver.cpp \
+       DerivedSources/WebKit2/AuthenticationManagerMessages.h \
+       DerivedSources/WebKit2/DrawingAreaMessageReceiver.cpp \
+       DerivedSources/WebKit2/DrawingAreaMessages.h \
+       DerivedSources/WebKit2/DrawingAreaProxyMessages.h \
+       DerivedSources/WebKit2/DrawingAreaProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/DownloadProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/DownloadProxyMessages.h \
+       DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
+       DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
+       DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/PluginControllerProxyMessages.h \
+       DerivedSources/WebKit2/PluginProcessMessageReceiver.cpp \
+       DerivedSources/WebKit2/PluginProcessMessages.h \
+       DerivedSources/WebKit2/PluginProcessProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/PluginProcessProxyMessages.h \
+       DerivedSources/WebKit2/PluginProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/PluginProxyMessages.h \
+       DerivedSources/WebKit2/WebApplicationCacheManagerMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebApplicationCacheManagerMessages.h \
+       DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessages.h \
+       DerivedSources/WebKit2/WebContextMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebContextMessages.h \
+       DerivedSources/WebKit2/WebCookieManagerMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebCookieManagerMessages.h \
+       DerivedSources/WebKit2/WebCookieManagerProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebCookieManagerProxyMessages.h \
+       DerivedSources/WebKit2/WebDatabaseManagerMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebDatabaseManagerMessages.h \
+       DerivedSources/WebKit2/WebDatabaseManagerProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebDatabaseManagerProxyMessages.h \
+       DerivedSources/WebKit2/WebFullScreenManagerMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebFullScreenManagerMessages.h \
+       DerivedSources/WebKit2/WebFullScreenManagerProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebFullScreenManagerProxyMessages.h \
+       DerivedSources/WebKit2/WebGeolocationManagerMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebGeolocationManagerMessages.h \
+       DerivedSources/WebKit2/WebGeolocationManagerProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebGeolocationManagerProxyMessages.h \
+       DerivedSources/WebKit2/WebIconDatabaseMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebIconDatabaseMessages.h \
+       DerivedSources/WebKit2/WebIconDatabaseProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebIconDatabaseProxyMessages.h \
+       DerivedSources/WebKit2/WebInspectorMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebInspectorMessages.h \
+       DerivedSources/WebKit2/WebInspectorProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebInspectorProxyMessages.h \
+       DerivedSources/WebKit2/WebKeyValueStorageManagerMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebKeyValueStorageManagerMessages.h \
+       DerivedSources/WebKit2/WebKeyValueStorageManagerProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebKeyValueStorageManagerProxyMessages.h \
+       DerivedSources/WebKit2/WebMediaCacheManagerMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebMediaCacheManagerMessages.h \
+       DerivedSources/WebKit2/WebMediaCacheManagerProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebMediaCacheManagerProxyMessages.h \
+       DerivedSources/WebKit2/WebPageProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebPageProxyMessages.h \
+       DerivedSources/WebKit2/WebPageMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebPageMessages.h \
+       DerivedSources/WebKit2/WebResourceCacheManagerMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebResourceCacheManagerMessages.h \
+       DerivedSources/WebKit2/WebResourceCacheManagerProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebResourceCacheManagerProxyMessages.h \
+       DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebProcessConnectionMessages.h \
+       DerivedSources/WebKit2/WebProcessMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebProcessMessages.h \
+       DerivedSources/WebKit2/WebProcessProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebProcessProxyMessages.h
+BUILT_SOURCES += $(webkit2_built_sources)
+nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES =$(webkit2_built_sources)
 
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
        Source/WebKit/gtk/webkit/webkiterror.h \
@@ -840,86 +911,11 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIB
 pkgconfig_DATA += Source/WebKit2/gtk/@WEBKITGTK_PC_NAME@2-@WEBKITGTK_API_VERSION@.pc
 
 # WebKit2 specific variables
-webkit2_built_sources += \
-       DerivedSources/WebKit2/AuthenticationManagerMessageReceiver.cpp \
-       DerivedSources/WebKit2/AuthenticationManagerMessages.h \
-       DerivedSources/WebKit2/DrawingAreaMessageReceiver.cpp \
-       DerivedSources/WebKit2/DrawingAreaMessages.h \
-       DerivedSources/WebKit2/DrawingAreaProxyMessages.h \
-       DerivedSources/WebKit2/DrawingAreaProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/DownloadProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/DownloadProxyMessages.h \
-       DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
-       DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
-       DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/PluginControllerProxyMessages.h \
-       DerivedSources/WebKit2/PluginProcessMessageReceiver.cpp \
-       DerivedSources/WebKit2/PluginProcessMessages.h \
-       DerivedSources/WebKit2/PluginProcessProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/PluginProcessProxyMessages.h \
-       DerivedSources/WebKit2/PluginProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/PluginProxyMessages.h \
-       DerivedSources/WebKit2/WebApplicationCacheManagerMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebApplicationCacheManagerMessages.h \
-       DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebApplicationCacheManagerProxyMessages.h \
-       DerivedSources/WebKit2/WebContextMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebContextMessages.h \
-       DerivedSources/WebKit2/WebCookieManagerMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebCookieManagerMessages.h \
-       DerivedSources/WebKit2/WebCookieManagerProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebCookieManagerProxyMessages.h \
-       DerivedSources/WebKit2/WebDatabaseManagerMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebDatabaseManagerMessages.h \
-       DerivedSources/WebKit2/WebDatabaseManagerProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebDatabaseManagerProxyMessages.h \
-       DerivedSources/WebKit2/WebFullScreenManagerMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebFullScreenManagerMessages.h \
-       DerivedSources/WebKit2/WebFullScreenManagerProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebFullScreenManagerProxyMessages.h \
-       DerivedSources/WebKit2/WebGeolocationManagerMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebGeolocationManagerMessages.h \
-       DerivedSources/WebKit2/WebGeolocationManagerProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebGeolocationManagerProxyMessages.h \
-       DerivedSources/WebKit2/WebIconDatabaseMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebIconDatabaseMessages.h \
-       DerivedSources/WebKit2/WebIconDatabaseProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebIconDatabaseProxyMessages.h \
-       DerivedSources/WebKit2/WebInspectorMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebInspectorMessages.h \
-       DerivedSources/WebKit2/WebInspectorProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebInspectorProxyMessages.h \
-       DerivedSources/WebKit2/WebKeyValueStorageManagerMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebKeyValueStorageManagerMessages.h \
-       DerivedSources/WebKit2/WebKeyValueStorageManagerProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebKeyValueStorageManagerProxyMessages.h \
-       DerivedSources/WebKit2/WebMediaCacheManagerMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebMediaCacheManagerMessages.h \
-       DerivedSources/WebKit2/WebMediaCacheManagerProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebMediaCacheManagerProxyMessages.h \
-       DerivedSources/WebKit2/WebPageProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebPageProxyMessages.h \
-       DerivedSources/WebKit2/WebPageMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebPageMessages.h \
-       DerivedSources/WebKit2/WebResourceCacheManagerMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebResourceCacheManagerMessages.h \
-       DerivedSources/WebKit2/WebResourceCacheManagerProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebResourceCacheManagerProxyMessages.h \
-       DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebProcessConnectionMessages.h \
-       DerivedSources/WebKit2/WebProcessMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebProcessMessages.h \
-       DerivedSources/WebKit2/WebProcessProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebProcessProxyMessages.h
-
-BUILT_SOURCES += \
-       $(webkit2_built_sources) \
-       generate-webkit2-forwarding-headers
-
 forwarding_headers := $(GENSOURCES_WEBKIT2)/include
 generate-webkit2-forwarding-headers: $(WebKit2)/Scripts/generate-forwarding-headers.pl $(libWebKit2_la_SOURCES)
        $(AM_V_GEN)$(PERL) $< $(WebKit2) $(forwarding_headers) gtk
        $(AM_V_GEN)$(PERL) $< $(WebKit2) $(forwarding_headers) soup 
+BUILT_SOURCES += generate-webkit2-forwarding-headers
 
 vpath %.messages.in = \
        $(WebKit2)/PluginProcess \
@@ -981,7 +977,8 @@ Programs_WebKitWebProcess_CFLAGS = \
        $(CAIRO_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(LIBSOUP_CFLAGS)
+       $(LIBSOUP_CFLAGS) \
+       $(ZLIB_CFLAGS)
 
 Programs_WebKitWebProcess_SOURCES = \
        Source/WebKit2/gtk/MainGtk.cpp
@@ -990,7 +987,8 @@ Programs_WebKitWebProcess_LDADD = \
        libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
        $(GLIB_LIBS) \
        $(GTK_LIBS) \
-       $(LIBSOUP_LIBS)
+       $(LIBSOUP_LIBS) \
+       $(ZLIB_CFLAGS)
 
 Programs_WebKitWebProcess_LDFLAGS = \
        -no-fast-install \
@@ -1035,17 +1033,8 @@ libWebCoreGtk2_la_CPPFLAGS = \
        $(SQLITE3_CFLAGS) \
        $(UNICODE_CFLAGS) \
        $(XRENDER_CFLAGS) \
-       $(XT_CFLAGS)
-
-plugin_process_built_sources = \
-       DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
-       DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
-       DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \
-       DerivedSources/WebKit2/PluginControllerProxyMessages.h \
-       DerivedSources/WebKit2/PluginProcessMessageReceiver.cpp \
-       DerivedSources/WebKit2/PluginProcessMessages.h \
-       DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \
-       DerivedSources/WebKit2/WebProcessConnectionMessages.h
+       $(XT_CFLAGS) \
+       $(ZLIB_LIBS)
 
 bin_PROGRAMS += \
        Programs/WebKitPluginProcess
@@ -1093,8 +1082,19 @@ Programs_WebKitPluginProcess_CFLAGS = \
        $(LIBSOUP_CFLAGS) \
        $(UNICODE_CFLAGS)
 
+webkit2_plugin_process_built_sources += \
+       DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
+       DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
+       DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \
+       DerivedSources/WebKit2/PluginControllerProxyMessages.h \
+       DerivedSources/WebKit2/PluginProcessMessageReceiver.cpp \
+       DerivedSources/WebKit2/PluginProcessMessages.h \
+       DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \
+       DerivedSources/WebKit2/WebProcessConnectionMessages.h
+nodist_Programs_WebKitPluginProcess_SOURCES = $(webkit2_plugin_process_built_sources)
+BUILT_SOURCES += $(nodist_Programs_WebKitPluginProcess_SOURCES)
+
 Programs_WebKitPluginProcess_SOURCES = \
-       $(plugin_process_built_sources) \
        Source/WebKit2/Platform/CoreIPC/ArgumentCoder.h \
        Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h \
        Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp \
@@ -1192,6 +1192,7 @@ Programs_WebKitPluginProcess_LDADD = \
        libWebCore.la \
        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
        libWebCoreGtk2.la \
+       $(webcore_ldflags) \
        $(CAIRO_LIBS) \
        $(COVERAGE_LDFLAGS) \
        $(GEOCLUE_LIBS) \
@@ -1202,11 +1203,16 @@ Programs_WebKitPluginProcess_LDADD = \
        $(LIBSOUP_LIBS) \
        $(LIBXML_LIBS) \
        $(LIBXSLT_LIBS) \
+       $(OLE32_LIBS) \
        $(PANGO_LIBS) \
        $(PNG_LIBS) \
+       $(SHLWAPI_LIBS) \
        $(SQLITE3_LIBS) \
        $(UNICODE_LIBS) \
-       $(XT_LIBS)
+       $(XRENDER_LIBS) \
+       $(XT_LIBS) \
+       $(WINMM_LIBS) \
+       $(ZLIB_LIBS)
 
 Programs_WebKitPluginProcess_LDFLAGS = \
        -no-fast-install \
@@ -1216,4 +1222,4 @@ Programs_WebKitPluginProcess_CXXFLAGS = \
        $(SYMBOL_VISIBILITY_INLINES) \
        $(global_cxxflags)
 
-endif
\ No newline at end of file
+endif

diff --git a/Source/autotools/webkit.m4 b/Source/autotools/webkit.m4
index ec5e8104deb04280245f8935d70cbccaf638e5f5..26be32cae9c108ee48f19972105605cd534b4deb 100644 (file)
--- a/Source/autotools/webkit.m4
+++ b/Source/autotools/webkit.m4
@@ -163,4 +163,9 @@ fi
 
 AC_SUBST([UNICODE_CFLAGS])
 AC_SUBST([UNICODE_LIBS])
+
+PKG_CHECK_MODULES([ZLIB], [zlib])
+AC_SUBST([ZLIB_CFLAGS])
+AC_SUBST([ZLIB_LIBS])
+
 ])

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index aed9087e455e5997db86c99f1094b922d7553a1e..01963dd7ddf33ccb5586cc9211a005c7e4b8b3fe 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-15  Martin Robinson  <mrobinson@igalia.com>
+
+        Build fixes for WebKit2. Ensure that all generated sources are
+        on nodist primaries, that they are on forward declared variables
+        so that BUILT_SOURCES is calculated properly and that zlib is 
+        included during linking (for WOFF support).
+
+        * WebKitTestRunner/GNUmakefile.am:
+
 2011-07-15  Dimitri Glazkov  <dglazkov@chromium.org>
 
         Store error and warning information on TestExpectationLine.

diff --git a/Tools/WebKitTestRunner/GNUmakefile.am b/Tools/WebKitTestRunner/GNUmakefile.am
index f4bb9b3772b55fa996adfaf16683dcb0d6541ea6..d95734099d583e769f5fa8aba5ac4f1698dd4a4f 100644 (file)
--- a/Tools/WebKitTestRunner/GNUmakefile.am
+++ b/Tools/WebKitTestRunner/GNUmakefile.am
@@ -51,14 +51,14 @@ Programs_WebKitTestRunner_LDFLAGS = \
 # The InjectedBundle library allows the render process to load harness code.
 noinst_LTLIBRARIES += Libraries/libTestRunnerInjectedBundle.la
 
-nodist_injected_bundle_built_sources = \
+webkittestrunner_built_sources += \
        DerivedSources/InjectedBundle/JSEventSendingController.cpp \
        DerivedSources/InjectedBundle/JSGCController.cpp \
        DerivedSources/InjectedBundle/JSLayoutTestController.cpp
-BUILT_SOURCES += $(nodist_injected_bundle_built_sources)
+nodist_Libraries_libTestRunnerInjectedBundle_la_SOURCES = $(webkittestrunner_built_sources)
+BUILT_SOURCES += $(webkittestrunner_built_sources)
 
 Libraries_libTestRunnerInjectedBundle_la_SOURCES = \
-       $(nodist_injected_bundle_built_sources) \
        Tools/WebKitTestRunner/InjectedBundle/ActivateFonts.h \
        Tools/WebKitTestRunner/InjectedBundle/Bindings/JSWrappable.h \
        Tools/WebKitTestRunner/InjectedBundle/Bindings/JSWrapper.cpp \