[GTK] Split SVG from WebCore to work-around make limitation
authorkov@webkit.org <kov@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Nov 2012 21:07:03 +0000 (21:07 +0000)
committerkov@webkit.org <kov@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Nov 2012 21:07:03 +0000 (21:07 +0000)
https://bugs.webkit.org/show_bug.cgi?id=97735

Reviewed by Carlos Garcia Campos.

Add a new libtool convenience library, libWebCoreSVG.la, to work-around
make limitation when linking libWebCore.

.:

* GNUmakefile.am: variables for the new library.

Source/WebCore:

* GNUmakefile.am: new libWebCoreSVG.la library.
* GNUmakefile.list.am: move SVG-related files to be part of the new library.

Source/WebKit/gtk:

* GNUmakefile.am: link libWebCoreSVG.la into libwebkitgtk.

Source/WebKit2:

* GNUmakefile.am: link libWebCoreSVG.la into libwebkit2gtk.

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

ChangeLog
GNUmakefile.am
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/GNUmakefile.am
Source/WebKit2/ChangeLog
Source/WebKit2/GNUmakefile.am

index 17a62bd..d4f0e81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-09-26  Gustavo Noronha Silva  <gns@gnome.org>
+
+        [GTK] Split SVG from WebCore to work-around make limitation
+        https://bugs.webkit.org/show_bug.cgi?id=97735
+
+        Reviewed by Carlos Garcia Campos.
+
+        Add a new libtool convenience library, libWebCoreSVG.la, to work-around
+        make limitation when linking libWebCore.
+
+        * GNUmakefile.am: variables for the new library.
+
 2012-11-22  Simon Hausmann  <simon.hausmann@digia.com>, Pierre Rossi <pierre.rossi@digia.com>
 
         [Qt] Separate QWidget dependant code into separate WebKitWidgets static library
index f4cb3fd..52384c6 100644 (file)
@@ -73,9 +73,11 @@ javascriptcore_built_sources :=
 javascriptcore_built_nosources :=
 llint_nosources :=
 offlineasm_nosources :=
-webcore_cppflags :=
 webcore_platform_sources :=
 webcore_modules_sources :=
+webcore_svg_built_sources :=
+webcore_svg_sources :=
+webcore_cppflags :=
 webcore_sources :=
 webcore_libadd :=
 webcore_built_sources :=
@@ -309,6 +311,7 @@ BUILT_SOURCES += \
        $(javascriptcore_built_nosources) \
        $(webcore_built_sources) \
        $(webcore_built_nosources) \
+       $(webcore_svg_built_sources) \
        $(webkitgtk_built_sources) \
        $(webkitgtk_built_nosources) \
        $(webkit2_built_sources) \
index 3b56382..48d393f 100644 (file)
@@ -1,3 +1,16 @@
+2012-09-26  Gustavo Noronha Silva  <gns@gnome.org>
+
+        [GTK] Split SVG from WebCore to work-around make limitation
+        https://bugs.webkit.org/show_bug.cgi?id=97735
+
+        Reviewed by Carlos Garcia Campos.
+
+        Add a new libtool convenience library, libWebCoreSVG.la, to work-around
+        make limitation when linking libWebCore.
+
+        * GNUmakefile.am: new libWebCoreSVG.la library.
+        * GNUmakefile.list.am: move SVG-related files to be part of the new library.
+
 2012-11-22  Pan Deng  <pan.deng@intel.com>
 
         [Web Inspector]Code Style changes in TimelinePresentationModel.js.
index 56e91c4..0ad046c 100644 (file)
@@ -274,6 +274,31 @@ DerivedSources/WebCore/MathMLElementFactory.cpp DerivedSources/WebCore/MathMLNam
 # FIXME: allow a more fine-grained inclusion/generation of sources per SVG feature
 # ----
 if ENABLE_SVG
+nodist_libWebCoreSVG_la_SOURCES = \
+       $(webcore_svg_built_sources)
+
+libWebCoreSVG_la_SOURCES = \
+       $(webcore_svg_sources)
+
+libWebCoreSVG_la_CXXFLAGS = \
+       $(SYMBOL_VISIBILITY_INLINES) \
+       $(global_cxxflags)
+
+libWebCoreSVG_la_CFLAGS = \
+       $(SYMBOL_VISIBILITY) \
+       $(global_cflags)
+
+libWebCoreSVG_la_CPPFLAGS = \
+       -DBUILDING_WebCore \
+       -DBUILDING_WEBKIT \
+       $(global_cppflags) \
+       $(webcore_cppflags) \
+       $(webcoregtk_cppflags) \
+       $(javascriptcore_cppflags) \
+       -fno-strict-aliasing \
+       $(CAIRO_CFLAGS) \
+       $(LIBSOUP_CFLAGS)
+
 feature_defines_overrides += ENABLE_SVG=1
 WEBCORE_CSS_PROPERTY_NAMES += $(WebCore)/css/SVGCSSPropertyNames.in
 WEBCORE_CSS_VALUE_KEYWORDS += $(WebCore)/css/SVGCSSValueKeywords.in
@@ -605,6 +630,11 @@ noinst_LTLIBRARIES += \
        libWebCoreModules.la \
        libWebCore.la
 
+if ENABLE_SVG
+noinst_LTLIBRARIES += \
+       libWebCoreSVG.la
+endif
+
 # Artificial dependency to try to force a relink of the WebCore libraries
 # When their makefiles change.
 webcore_lib_for_dep = libWebCore.la
@@ -616,6 +646,9 @@ $(webcoremodules_lib_for_dep): $(srcdir)/Source/WebCore/GNUmakefile.am $(srcdir)
 webcoreplatform_lib_for_dep = libWebcorePlatform.la
 $(webcoreplatform_lib_for_dep): $(srcdir)/Source/WebCore/GNUmakefile.am $(srcdir)/Source/WebCore/GNUmakefile.list.am
 
+webcoresvg_lib_for_dep = libWebCoreSVG.la
+$(webcoresvg_lib_for_dep): $(srcdir)/Source/WebCore/GNUmakefile.am $(srcdir)/Source/WebCore/GNUmakefile.list.am
+
 nodist_EXTRA_libWebCore_la_SOURCES = \
        $(webcore_built_nosources)
 
index 5ae9283..cffda8c 100644 (file)
@@ -715,6 +715,169 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSStyleSheet.h \
        DerivedSources/WebCore/JSStyleSheetList.cpp \
        DerivedSources/WebCore/JSStyleSheetList.h \
+       DerivedSources/WebCore/JSText.cpp \
+       DerivedSources/WebCore/JSTextEvent.cpp \
+       DerivedSources/WebCore/JSTextEvent.h \
+       DerivedSources/WebCore/JSText.h \
+       DerivedSources/WebCore/JSTextMetrics.cpp \
+       DerivedSources/WebCore/JSTextMetrics.h \
+       DerivedSources/WebCore/JSTextTrack.cpp \
+       DerivedSources/WebCore/JSTextTrack.h \
+       DerivedSources/WebCore/JSTextTrackCue.cpp \
+       DerivedSources/WebCore/JSTextTrackCue.h \
+       DerivedSources/WebCore/JSTextTrackCueList.cpp \
+       DerivedSources/WebCore/JSTextTrackCueList.h \
+       DerivedSources/WebCore/JSTextTrackList.cpp \
+       DerivedSources/WebCore/JSTextTrackList.h \
+       DerivedSources/WebCore/JSTimeRanges.cpp \
+       DerivedSources/WebCore/JSTimeRanges.h \
+       DerivedSources/WebCore/JSTouch.cpp \
+       DerivedSources/WebCore/JSTouchEvent.cpp \
+       DerivedSources/WebCore/JSTouchEvent.h \
+       DerivedSources/WebCore/JSTouch.h \
+       DerivedSources/WebCore/JSTouchList.cpp \
+       DerivedSources/WebCore/JSTouchList.h \
+       DerivedSources/WebCore/JSTrackEvent.cpp \
+       DerivedSources/WebCore/JSTrackEvent.h \
+       DerivedSources/WebCore/JSTreeWalker.cpp \
+       DerivedSources/WebCore/JSTreeWalker.h \
+       DerivedSources/WebCore/JSUIEvent.cpp \
+       DerivedSources/WebCore/JSUIEvent.h \
+       DerivedSources/WebCore/JSUint16Array.cpp \
+       DerivedSources/WebCore/JSUint16Array.h \
+       DerivedSources/WebCore/JSUint32Array.cpp \
+       DerivedSources/WebCore/JSUint32Array.h \
+       DerivedSources/WebCore/JSUint8Array.cpp \
+       DerivedSources/WebCore/JSUint8Array.h \
+       DerivedSources/WebCore/JSUint8ClampedArray.cpp \
+       DerivedSources/WebCore/JSUint8ClampedArray.h \
+       DerivedSources/WebCore/JSValidityState.cpp \
+       DerivedSources/WebCore/JSValidityState.h \
+       DerivedSources/WebCore/JSVoidCallback.cpp \
+       DerivedSources/WebCore/JSVoidCallback.h \
+       DerivedSources/WebCore/JSWaveShaperNode.cpp \
+       DerivedSources/WebCore/JSWaveShaperNode.h \
+       DerivedSources/WebCore/JSWaveTable.cpp \
+       DerivedSources/WebCore/JSWaveTable.h \
+       DerivedSources/WebCore/JSWebGLActiveInfo.cpp \
+       DerivedSources/WebCore/JSWebGLActiveInfo.h \
+       DerivedSources/WebCore/JSWebGLBuffer.cpp \
+       DerivedSources/WebCore/JSWebGLBuffer.h \
+       DerivedSources/WebCore/JSWebGLCompressedTextureS3TC.cpp \
+       DerivedSources/WebCore/JSWebGLCompressedTextureS3TC.h \
+       DerivedSources/WebCore/JSWebGLContextAttributes.cpp \
+       DerivedSources/WebCore/JSWebGLContextAttributes.h \
+       DerivedSources/WebCore/JSWebGLContextEvent.cpp \
+       DerivedSources/WebCore/JSWebGLContextEvent.h \
+       DerivedSources/WebCore/JSWebGLDepthTexture.cpp \
+       DerivedSources/WebCore/JSWebGLDepthTexture.h \
+       DerivedSources/WebCore/JSWebGLFramebuffer.cpp \
+       DerivedSources/WebCore/JSWebGLFramebuffer.h \
+       DerivedSources/WebCore/JSWebGLLoseContext.cpp \
+       DerivedSources/WebCore/JSWebGLLoseContext.h \
+       DerivedSources/WebCore/JSWebGLProgram.cpp \
+       DerivedSources/WebCore/JSWebGLProgram.h \
+       DerivedSources/WebCore/JSWebGLRenderbuffer.cpp \
+       DerivedSources/WebCore/JSWebGLRenderbuffer.h \
+       DerivedSources/WebCore/JSWebGLRenderingContext.cpp \
+       DerivedSources/WebCore/JSWebGLRenderingContext.h \
+       DerivedSources/WebCore/JSWebGLShader.cpp \
+       DerivedSources/WebCore/JSWebGLShader.h \
+       DerivedSources/WebCore/JSWebGLShaderPrecisionFormat.cpp \
+       DerivedSources/WebCore/JSWebGLShaderPrecisionFormat.h \
+       DerivedSources/WebCore/JSWebGLTexture.cpp \
+       DerivedSources/WebCore/JSWebGLTexture.h \
+       DerivedSources/WebCore/JSWebGLUniformLocation.cpp \
+       DerivedSources/WebCore/JSWebGLUniformLocation.h \
+       DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.cpp \
+       DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.h \
+       DerivedSources/WebCore/JSWebKitAnimation.cpp \
+       DerivedSources/WebCore/JSWebKitAnimation.h \
+       DerivedSources/WebCore/JSWebKitAnimationEvent.cpp \
+       DerivedSources/WebCore/JSWebKitAnimationList.h \
+       DerivedSources/WebCore/JSWebKitAnimationList.cpp \
+       DerivedSources/WebCore/JSWebKitAnimationEvent.h \
+       DerivedSources/WebCore/JSWebKitCSSFilterValue.cpp \
+       DerivedSources/WebCore/JSWebKitCSSFilterValue.h \
+       DerivedSources/WebCore/JSWebKitCSSKeyframeRule.cpp \
+       DerivedSources/WebCore/JSWebKitCSSKeyframeRule.h \
+       DerivedSources/WebCore/JSWebKitCSSKeyframesRule.cpp \
+       DerivedSources/WebCore/JSWebKitCSSKeyframesRule.h \
+       DerivedSources/WebCore/JSWebKitCSSMatrix.cpp \
+       DerivedSources/WebCore/JSWebKitCSSMatrix.h \
+       DerivedSources/WebCore/JSWebKitCSSRegionRule.cpp \
+       DerivedSources/WebCore/JSWebKitCSSRegionRule.h \
+       DerivedSources/WebCore/JSWebKitCSSTransformValue.cpp \
+       DerivedSources/WebCore/JSWebKitCSSTransformValue.h \
+       DerivedSources/WebCore/JSWebKitNamedFlow.cpp \
+       DerivedSources/WebCore/JSWebKitNamedFlow.h \
+       DerivedSources/WebCore/JSWebKitPoint.cpp \
+       DerivedSources/WebCore/JSWebKitPoint.h \
+       DerivedSources/WebCore/JSWebKitTransitionEvent.cpp \
+       DerivedSources/WebCore/JSWebKitTransitionEvent.h \
+       DerivedSources/WebCore/JSWebSocket.cpp \
+       DerivedSources/WebCore/JSWebSocket.h \
+       DerivedSources/WebCore/JSWheelEvent.cpp \
+       DerivedSources/WebCore/JSWheelEvent.h \
+       DerivedSources/WebCore/JSWorkerContext.cpp \
+       DerivedSources/WebCore/JSWorkerContext.h \
+       DerivedSources/WebCore/JSWorker.cpp \
+       DerivedSources/WebCore/JSWorker.h \
+       DerivedSources/WebCore/JSWorkerLocation.cpp \
+       DerivedSources/WebCore/JSWorkerLocation.h \
+       DerivedSources/WebCore/JSWorkerNavigator.cpp \
+       DerivedSources/WebCore/JSWorkerNavigator.h \
+       DerivedSources/WebCore/JSXMLHttpRequest.cpp \
+       DerivedSources/WebCore/JSXMLHttpRequestException.cpp \
+       DerivedSources/WebCore/JSXMLHttpRequestException.h \
+       DerivedSources/WebCore/JSXMLHttpRequest.h \
+       DerivedSources/WebCore/JSXMLHttpRequestProgressEvent.cpp \
+       DerivedSources/WebCore/JSXMLHttpRequestProgressEvent.h \
+       DerivedSources/WebCore/JSXMLHttpRequestUpload.cpp \
+       DerivedSources/WebCore/JSXMLHttpRequestUpload.h \
+       DerivedSources/WebCore/JSXMLSerializer.cpp \
+       DerivedSources/WebCore/JSXMLSerializer.h \
+       DerivedSources/WebCore/JSXPathEvaluator.cpp \
+       DerivedSources/WebCore/JSXPathEvaluator.h \
+       DerivedSources/WebCore/JSXPathException.cpp \
+       DerivedSources/WebCore/JSXPathException.h \
+       DerivedSources/WebCore/JSXPathExpression.cpp \
+       DerivedSources/WebCore/JSXPathExpression.h \
+       DerivedSources/WebCore/JSXPathNSResolver.cpp \
+       DerivedSources/WebCore/JSXPathNSResolver.h \
+       DerivedSources/WebCore/JSXPathResult.cpp \
+       DerivedSources/WebCore/JSXPathResult.h \
+       DerivedSources/WebCore/JSXSLTProcessor.cpp \
+       DerivedSources/WebCore/JSXSLTProcessor.h \
+       DerivedSources/WebCore/MathMLElementFactory.cpp \
+       DerivedSources/WebCore/MathMLElementFactory.h \
+       DerivedSources/WebCore/MathMLNames.cpp \
+       DerivedSources/WebCore/MathMLNames.h \
+       DerivedSources/WebCore/SettingsMacros.h \
+       DerivedSources/WebCore/UserAgentGtk.h \
+       DerivedSources/WebCore/UserAgentStyleSheetsData.cpp \
+       DerivedSources/WebCore/UserAgentStyleSheets.h \
+       DerivedSources/WebCore/WebKitFontFamilyNames.cpp \
+       DerivedSources/WebCore/WebKitFontFamilyNames.h \
+       DerivedSources/WebCore/XLinkNames.cpp \
+       DerivedSources/WebCore/XMLNames.cpp \
+       DerivedSources/WebCore/XMLNames.h \
+       DerivedSources/WebCore/XMLNSNames.cpp \
+       DerivedSources/WebCore/XMLNSNames.h \
+       DerivedSources/WebCore/XMLViewerCSS.h \
+       DerivedSources/WebCore/XMLViewerJS.h \
+       DerivedSources/WebCore/XPathGrammar.cpp \
+       DerivedSources/WebCore/XPathGrammar.h
+
+# These files need to be part of WebCore otherwise they cause undefined
+# symbols havoc
+webcore_built_sources += \
+       DerivedSources/WebCore/JSSVGDocument.cpp \
+       DerivedSources/WebCore/JSSVGDocument.h \
+       DerivedSources/WebCore/SVGNames.cpp \
+       DerivedSources/WebCore/SVGElementFactory.cpp
+
+webcore_svg_built_sources += \
        DerivedSources/WebCore/JSSVGAElement.cpp \
        DerivedSources/WebCore/JSSVGAElement.h \
        DerivedSources/WebCore/JSSVGAltGlyphDefElement.cpp \
@@ -773,8 +936,6 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSSVGDefsElement.h \
        DerivedSources/WebCore/JSSVGDescElement.cpp \
        DerivedSources/WebCore/JSSVGDescElement.h \
-       DerivedSources/WebCore/JSSVGDocument.cpp \
-       DerivedSources/WebCore/JSSVGDocument.h \
        DerivedSources/WebCore/JSSVGElement.cpp \
        DerivedSources/WebCore/JSSVGElement.h \
        DerivedSources/WebCore/JSSVGElementInstance.cpp \
@@ -1010,162 +1171,7 @@ webcore_built_sources += \
        DerivedSources/WebCore/JSSVGZoomAndPan.cpp \
        DerivedSources/WebCore/JSSVGZoomAndPan.h \
        DerivedSources/WebCore/JSSVGZoomEvent.cpp \
-       DerivedSources/WebCore/JSSVGZoomEvent.h \
-       DerivedSources/WebCore/JSText.cpp \
-       DerivedSources/WebCore/JSTextEvent.cpp \
-       DerivedSources/WebCore/JSTextEvent.h \
-       DerivedSources/WebCore/JSText.h \
-       DerivedSources/WebCore/JSTextMetrics.cpp \
-       DerivedSources/WebCore/JSTextMetrics.h \
-       DerivedSources/WebCore/JSTextTrack.cpp \
-       DerivedSources/WebCore/JSTextTrack.h \
-       DerivedSources/WebCore/JSTextTrackCue.cpp \
-       DerivedSources/WebCore/JSTextTrackCue.h \
-       DerivedSources/WebCore/JSTextTrackCueList.cpp \
-       DerivedSources/WebCore/JSTextTrackCueList.h \
-       DerivedSources/WebCore/JSTextTrackList.cpp \
-       DerivedSources/WebCore/JSTextTrackList.h \
-       DerivedSources/WebCore/JSTimeRanges.cpp \
-       DerivedSources/WebCore/JSTimeRanges.h \
-       DerivedSources/WebCore/JSTouch.cpp \
-       DerivedSources/WebCore/JSTouchEvent.cpp \
-       DerivedSources/WebCore/JSTouchEvent.h \
-       DerivedSources/WebCore/JSTouch.h \
-       DerivedSources/WebCore/JSTouchList.cpp \
-       DerivedSources/WebCore/JSTouchList.h \
-       DerivedSources/WebCore/JSTrackEvent.cpp \
-       DerivedSources/WebCore/JSTrackEvent.h \
-       DerivedSources/WebCore/JSTreeWalker.cpp \
-       DerivedSources/WebCore/JSTreeWalker.h \
-       DerivedSources/WebCore/JSUIEvent.cpp \
-       DerivedSources/WebCore/JSUIEvent.h \
-       DerivedSources/WebCore/JSUint16Array.cpp \
-       DerivedSources/WebCore/JSUint16Array.h \
-       DerivedSources/WebCore/JSUint32Array.cpp \
-       DerivedSources/WebCore/JSUint32Array.h \
-       DerivedSources/WebCore/JSUint8Array.cpp \
-       DerivedSources/WebCore/JSUint8Array.h \
-       DerivedSources/WebCore/JSUint8ClampedArray.cpp \
-       DerivedSources/WebCore/JSUint8ClampedArray.h \
-       DerivedSources/WebCore/JSValidityState.cpp \
-       DerivedSources/WebCore/JSValidityState.h \
-       DerivedSources/WebCore/JSVoidCallback.cpp \
-       DerivedSources/WebCore/JSVoidCallback.h \
-       DerivedSources/WebCore/JSWaveShaperNode.cpp \
-       DerivedSources/WebCore/JSWaveShaperNode.h \
-       DerivedSources/WebCore/JSWaveTable.cpp \
-       DerivedSources/WebCore/JSWaveTable.h \
-       DerivedSources/WebCore/JSWebGLActiveInfo.cpp \
-       DerivedSources/WebCore/JSWebGLActiveInfo.h \
-       DerivedSources/WebCore/JSWebGLBuffer.cpp \
-       DerivedSources/WebCore/JSWebGLBuffer.h \
-       DerivedSources/WebCore/JSWebGLCompressedTextureS3TC.cpp \
-       DerivedSources/WebCore/JSWebGLCompressedTextureS3TC.h \
-       DerivedSources/WebCore/JSWebGLContextAttributes.cpp \
-       DerivedSources/WebCore/JSWebGLContextAttributes.h \
-       DerivedSources/WebCore/JSWebGLContextEvent.cpp \
-       DerivedSources/WebCore/JSWebGLContextEvent.h \
-       DerivedSources/WebCore/JSWebGLDepthTexture.cpp \
-       DerivedSources/WebCore/JSWebGLDepthTexture.h \
-       DerivedSources/WebCore/JSWebGLFramebuffer.cpp \
-       DerivedSources/WebCore/JSWebGLFramebuffer.h \
-       DerivedSources/WebCore/JSWebGLLoseContext.cpp \
-       DerivedSources/WebCore/JSWebGLLoseContext.h \
-       DerivedSources/WebCore/JSWebGLProgram.cpp \
-       DerivedSources/WebCore/JSWebGLProgram.h \
-       DerivedSources/WebCore/JSWebGLRenderbuffer.cpp \
-       DerivedSources/WebCore/JSWebGLRenderbuffer.h \
-       DerivedSources/WebCore/JSWebGLRenderingContext.cpp \
-       DerivedSources/WebCore/JSWebGLRenderingContext.h \
-       DerivedSources/WebCore/JSWebGLShader.cpp \
-       DerivedSources/WebCore/JSWebGLShader.h \
-       DerivedSources/WebCore/JSWebGLShaderPrecisionFormat.cpp \
-       DerivedSources/WebCore/JSWebGLShaderPrecisionFormat.h \
-       DerivedSources/WebCore/JSWebGLTexture.cpp \
-       DerivedSources/WebCore/JSWebGLTexture.h \
-       DerivedSources/WebCore/JSWebGLUniformLocation.cpp \
-       DerivedSources/WebCore/JSWebGLUniformLocation.h \
-       DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.cpp \
-       DerivedSources/WebCore/JSWebGLVertexArrayObjectOES.h \
-       DerivedSources/WebCore/JSWebKitAnimation.cpp \
-       DerivedSources/WebCore/JSWebKitAnimation.h \
-       DerivedSources/WebCore/JSWebKitAnimationEvent.cpp \
-       DerivedSources/WebCore/JSWebKitAnimationList.h \
-       DerivedSources/WebCore/JSWebKitAnimationList.cpp \
-       DerivedSources/WebCore/JSWebKitAnimationEvent.h \
-       DerivedSources/WebCore/JSWebKitCSSFilterValue.cpp \
-       DerivedSources/WebCore/JSWebKitCSSFilterValue.h \
-       DerivedSources/WebCore/JSWebKitCSSKeyframeRule.cpp \
-       DerivedSources/WebCore/JSWebKitCSSKeyframeRule.h \
-       DerivedSources/WebCore/JSWebKitCSSKeyframesRule.cpp \
-       DerivedSources/WebCore/JSWebKitCSSKeyframesRule.h \
-       DerivedSources/WebCore/JSWebKitCSSMatrix.cpp \
-       DerivedSources/WebCore/JSWebKitCSSMatrix.h \
-       DerivedSources/WebCore/JSWebKitCSSRegionRule.cpp \
-       DerivedSources/WebCore/JSWebKitCSSRegionRule.h \
-       DerivedSources/WebCore/JSWebKitCSSTransformValue.cpp \
-       DerivedSources/WebCore/JSWebKitCSSTransformValue.h \
-       DerivedSources/WebCore/JSWebKitNamedFlow.cpp \
-       DerivedSources/WebCore/JSWebKitNamedFlow.h \
-       DerivedSources/WebCore/JSWebKitPoint.cpp \
-       DerivedSources/WebCore/JSWebKitPoint.h \
-       DerivedSources/WebCore/JSWebKitTransitionEvent.cpp \
-       DerivedSources/WebCore/JSWebKitTransitionEvent.h \
-       DerivedSources/WebCore/JSWebSocket.cpp \
-       DerivedSources/WebCore/JSWebSocket.h \
-       DerivedSources/WebCore/JSWheelEvent.cpp \
-       DerivedSources/WebCore/JSWheelEvent.h \
-       DerivedSources/WebCore/JSWorkerContext.cpp \
-       DerivedSources/WebCore/JSWorkerContext.h \
-       DerivedSources/WebCore/JSWorker.cpp \
-       DerivedSources/WebCore/JSWorker.h \
-       DerivedSources/WebCore/JSWorkerLocation.cpp \
-       DerivedSources/WebCore/JSWorkerLocation.h \
-       DerivedSources/WebCore/JSWorkerNavigator.cpp \
-       DerivedSources/WebCore/JSWorkerNavigator.h \
-       DerivedSources/WebCore/JSXMLHttpRequest.cpp \
-       DerivedSources/WebCore/JSXMLHttpRequestException.cpp \
-       DerivedSources/WebCore/JSXMLHttpRequestException.h \
-       DerivedSources/WebCore/JSXMLHttpRequest.h \
-       DerivedSources/WebCore/JSXMLHttpRequestProgressEvent.cpp \
-       DerivedSources/WebCore/JSXMLHttpRequestProgressEvent.h \
-       DerivedSources/WebCore/JSXMLHttpRequestUpload.cpp \
-       DerivedSources/WebCore/JSXMLHttpRequestUpload.h \
-       DerivedSources/WebCore/JSXMLSerializer.cpp \
-       DerivedSources/WebCore/JSXMLSerializer.h \
-       DerivedSources/WebCore/JSXPathEvaluator.cpp \
-       DerivedSources/WebCore/JSXPathEvaluator.h \
-       DerivedSources/WebCore/JSXPathException.cpp \
-       DerivedSources/WebCore/JSXPathException.h \
-       DerivedSources/WebCore/JSXPathExpression.cpp \
-       DerivedSources/WebCore/JSXPathExpression.h \
-       DerivedSources/WebCore/JSXPathNSResolver.cpp \
-       DerivedSources/WebCore/JSXPathNSResolver.h \
-       DerivedSources/WebCore/JSXPathResult.cpp \
-       DerivedSources/WebCore/JSXPathResult.h \
-       DerivedSources/WebCore/JSXSLTProcessor.cpp \
-       DerivedSources/WebCore/JSXSLTProcessor.h \
-       DerivedSources/WebCore/MathMLElementFactory.cpp \
-       DerivedSources/WebCore/MathMLElementFactory.h \
-       DerivedSources/WebCore/MathMLNames.cpp \
-       DerivedSources/WebCore/MathMLNames.h \
-       DerivedSources/WebCore/SettingsMacros.h \
-       DerivedSources/WebCore/SVGElementFactory.cpp \
-       DerivedSources/WebCore/SVGNames.cpp \
-       DerivedSources/WebCore/UserAgentGtk.h \
-       DerivedSources/WebCore/UserAgentStyleSheetsData.cpp \
-       DerivedSources/WebCore/UserAgentStyleSheets.h \
-       DerivedSources/WebCore/WebKitFontFamilyNames.cpp \
-       DerivedSources/WebCore/WebKitFontFamilyNames.h \
-       DerivedSources/WebCore/XLinkNames.cpp \
-       DerivedSources/WebCore/XMLNames.cpp \
-       DerivedSources/WebCore/XMLNames.h \
-       DerivedSources/WebCore/XMLNSNames.cpp \
-       DerivedSources/WebCore/XMLNSNames.h \
-       DerivedSources/WebCore/XMLViewerCSS.h \
-       DerivedSources/WebCore/XMLViewerJS.h \
-       DerivedSources/WebCore/XPathGrammar.cpp \
-       DerivedSources/WebCore/XPathGrammar.h
+       DerivedSources/WebCore/JSSVGZoomEvent.h
 
 dom_binding_idls += \
        $(WebCore)/Modules/filesystem/DOMFileSystem.idl \
@@ -2367,9 +2373,6 @@ webcore_sources += \
        Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp \
        Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp \
        Source/WebCore/bindings/js/JSSQLTransactionSyncCustom.cpp \
-       Source/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp \
-       Source/WebCore/bindings/js/JSSVGLengthCustom.cpp \
-       Source/WebCore/bindings/js/JSSVGPathSegCustom.cpp \
        Source/WebCore/bindings/js/JSSharedWorkerCustom.cpp \
        Source/WebCore/bindings/js/JSStorageCustom.cpp \
        Source/WebCore/bindings/js/JSStorageCustom.h \
@@ -2479,7 +2482,6 @@ webcore_sources += \
        Source/WebCore/config.h \
        Source/WebCore/css/BasicShapeFunctions.cpp \
        Source/WebCore/css/BasicShapeFunctions.h \
-       Source/WebCore/css/CachedSVGDocumentReference.h \
        Source/WebCore/css/Counter.h \
        Source/WebCore/css/CSSAspectRatioValue.cpp \
        Source/WebCore/css/CSSAspectRatioValue.h \
@@ -2642,13 +2644,10 @@ webcore_sources += \
        Source/WebCore/css/StyleSheetContents.h \
        Source/WebCore/css/StyleSheetList.cpp \
        Source/WebCore/css/StyleSheetList.h \
-       Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp \
-       Source/WebCore/css/SVGCSSParser.cpp \
-       Source/WebCore/css/SVGCSSStyleSelector.cpp \
        Source/WebCore/css/ViewportStyleResolver.cpp \
        Source/WebCore/css/ViewportStyleResolver.h \
-    Source/WebCore/css/WebKitCSSArrayFunctionValue.cpp \
-    Source/WebCore/css/WebKitCSSArrayFunctionValue.h \
+       Source/WebCore/css/WebKitCSSArrayFunctionValue.cpp \
+       Source/WebCore/css/WebKitCSSArrayFunctionValue.h \
        Source/WebCore/css/WebKitCSSFilterValue.cpp \
        Source/WebCore/css/WebKitCSSFilterValue.h \
        Source/WebCore/css/WebKitCSSKeyframeRule.cpp \
@@ -2661,8 +2660,6 @@ webcore_sources += \
        Source/WebCore/css/WebKitCSSMixFunctionValue.h \
        Source/WebCore/css/WebKitCSSRegionRule.cpp \
        Source/WebCore/css/WebKitCSSRegionRule.h \
-       Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp \
-       Source/WebCore/css/WebKitCSSSVGDocumentValue.h \
        Source/WebCore/css/WebKitCSSShaderValue.cpp \
        Source/WebCore/css/WebKitCSSShaderValue.h \
        Source/WebCore/css/WebKitCSSTransformValue.cpp \
@@ -3839,9 +3836,6 @@ webcore_sources += \
        Source/WebCore/loader/cache/CachedShader.cpp \
        Source/WebCore/loader/cache/CachedShader.h \
        Source/WebCore/loader/cache/CachedStyleSheetClient.h \
-       Source/WebCore/loader/cache/CachedSVGDocument.cpp \
-       Source/WebCore/loader/cache/CachedSVGDocument.h \
-       Source/WebCore/loader/cache/CachedSVGDocumentReference.h \
        Source/WebCore/loader/cache/CachedTextTrack.cpp \
        Source/WebCore/loader/cache/CachedTextTrack.h \
        Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp \
@@ -4502,6 +4496,165 @@ webcore_sources += \
        Source/WebCore/rendering/style/StyleVariableData.h \
        Source/WebCore/rendering/style/StyleVisualData.cpp \
        Source/WebCore/rendering/style/StyleVisualData.h \
+       Source/WebCore/rendering/TableLayout.h \
+       Source/WebCore/rendering/TrailingFloatsRootInlineBox.h \
+       Source/WebCore/storage/StorageTask.cpp \
+       Source/WebCore/storage/StorageTask.h \
+       Source/WebCore/storage/StorageThread.cpp \
+       Source/WebCore/storage/StorageThread.h \
+       Source/WebCore/storage/StorageArea.h \
+       Source/WebCore/storage/StorageAreaImpl.cpp \
+       Source/WebCore/storage/StorageAreaImpl.h \
+       Source/WebCore/storage/StorageAreaSync.cpp \
+       Source/WebCore/storage/StorageAreaSync.h \
+       Source/WebCore/storage/Storage.cpp \
+       Source/WebCore/storage/Storage.h \
+       Source/WebCore/storage/StorageEvent.cpp \
+       Source/WebCore/storage/StorageEvent.h \
+       Source/WebCore/storage/StorageEventDispatcher.cpp \
+       Source/WebCore/storage/StorageEventDispatcher.h \
+       Source/WebCore/storage/StorageMap.cpp \
+       Source/WebCore/storage/StorageMap.h \
+       Source/WebCore/storage/StorageNamespace.cpp \
+       Source/WebCore/storage/StorageNamespace.h \
+       Source/WebCore/storage/StorageNamespaceImpl.cpp \
+       Source/WebCore/storage/StorageNamespaceImpl.h \
+       Source/WebCore/storage/StorageSyncManager.cpp \
+       Source/WebCore/storage/StorageSyncManager.h \
+       Source/WebCore/storage/StorageTracker.cpp \
+       Source/WebCore/storage/StorageTracker.h \
+       Source/WebCore/storage/StorageTrackerClient.h \
+       Source/WebCore/WebCorePrefix.h \
+       Source/WebCore/workers/AbstractWorker.cpp \
+       Source/WebCore/workers/AbstractWorker.h \
+       Source/WebCore/workers/DedicatedWorkerContext.cpp \
+       Source/WebCore/workers/DedicatedWorkerContext.h \
+       Source/WebCore/workers/DedicatedWorkerThread.cpp \
+       Source/WebCore/workers/DedicatedWorkerThread.h \
+       Source/WebCore/workers/DefaultSharedWorkerRepository.cpp \
+       Source/WebCore/workers/DefaultSharedWorkerRepository.h \
+       Source/WebCore/workers/SharedWorkerContext.cpp \
+       Source/WebCore/workers/SharedWorkerContext.h \
+       Source/WebCore/workers/SharedWorker.cpp \
+       Source/WebCore/workers/SharedWorker.h \
+       Source/WebCore/workers/SharedWorkerRepository.h \
+       Source/WebCore/workers/SharedWorkerStrategy.h \
+       Source/WebCore/workers/SharedWorkerThread.cpp \
+       Source/WebCore/workers/SharedWorkerThread.h \
+       Source/WebCore/workers/WorkerContext.cpp \
+       Source/WebCore/workers/WorkerContext.h \
+       Source/WebCore/workers/WorkerContextProxy.h \
+       Source/WebCore/workers/WorkerEventQueue.cpp \
+       Source/WebCore/workers/WorkerEventQueue.h \
+       Source/WebCore/workers/Worker.cpp \
+       Source/WebCore/workers/Worker.h \
+       Source/WebCore/workers/WorkerLoaderProxy.h \
+       Source/WebCore/workers/WorkerLocation.cpp \
+       Source/WebCore/workers/WorkerLocation.h \
+       Source/WebCore/workers/WorkerMessagingProxy.cpp \
+       Source/WebCore/workers/WorkerMessagingProxy.h \
+       Source/WebCore/workers/WorkerObjectProxy.h \
+       Source/WebCore/workers/WorkerReportingProxy.h \
+       Source/WebCore/workers/WorkerRunLoop.cpp \
+       Source/WebCore/workers/WorkerRunLoop.h \
+       Source/WebCore/workers/WorkerScriptLoaderClient.h \
+       Source/WebCore/workers/WorkerScriptLoader.cpp \
+       Source/WebCore/workers/WorkerScriptLoader.h \
+       Source/WebCore/workers/WorkerThread.cpp \
+       Source/WebCore/workers/WorkerThread.h \
+       Source/WebCore/xml/parser/CharacterReferenceParserInlines.h \
+       Source/WebCore/xml/parser/MarkupTokenBase.h \
+       Source/WebCore/xml/parser/MarkupTokenizerBase.h \
+       Source/WebCore/xml/parser/MarkupTokenizerInlines.h \
+       Source/WebCore/xml/parser/NewXMLDocumentParser.cpp \
+       Source/WebCore/xml/parser/NewXMLDocumentParser.h \
+       Source/WebCore/xml/parser/XMLCharacterReferenceParser.cpp \
+       Source/WebCore/xml/parser/XMLCharacterReferenceParser.h \
+       Source/WebCore/xml/parser/XMLDocumentParser.cpp \
+       Source/WebCore/xml/parser/XMLDocumentParser.h \
+       Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp \
+       Source/WebCore/xml/parser/XMLDocumentParserScope.cpp \
+       Source/WebCore/xml/parser/XMLDocumentParserScope.h \
+       Source/WebCore/xml/parser/XMLTokenizer.cpp \
+       Source/WebCore/xml/parser/XMLTokenizer.h \
+       Source/WebCore/xml/parser/XMLToken.h \
+       Source/WebCore/xml/parser/XMLTreeBuilder.cpp \
+       Source/WebCore/xml/parser/XMLTreeBuilder.h \
+       Source/WebCore/xml/DOMParser.cpp \
+       Source/WebCore/xml/DOMParser.h \
+       Source/WebCore/xml/NativeXPathNSResolver.cpp \
+       Source/WebCore/xml/NativeXPathNSResolver.h \
+       Source/WebCore/xml/XMLErrors.cpp \
+       Source/WebCore/xml/XMLErrors.h \
+       Source/WebCore/xml/XMLHttpRequest.cpp \
+       Source/WebCore/xml/XMLHttpRequestException.cpp \
+       Source/WebCore/xml/XMLHttpRequestException.h \
+       Source/WebCore/xml/XMLHttpRequest.h \
+       Source/WebCore/xml/XMLHttpRequestProgressEvent.h \
+       Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp \
+       Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h \
+       Source/WebCore/xml/XMLHttpRequestUpload.cpp \
+       Source/WebCore/xml/XMLHttpRequestUpload.h \
+       Source/WebCore/xml/XMLTreeViewer.cpp \
+       Source/WebCore/xml/XMLTreeViewer.h \
+       Source/WebCore/xml/XMLSerializer.cpp \
+       Source/WebCore/xml/XMLSerializer.h \
+       Source/WebCore/xml/XPathEvaluator.cpp \
+       Source/WebCore/xml/XPathEvaluator.h \
+       Source/WebCore/xml/XPathException.cpp \
+       Source/WebCore/xml/XPathException.h \
+       Source/WebCore/xml/XPathExpression.cpp \
+       Source/WebCore/xml/XPathExpression.h \
+       Source/WebCore/xml/XPathExpressionNode.cpp \
+       Source/WebCore/xml/XPathExpressionNode.h \
+       Source/WebCore/xml/XPathFunctions.cpp \
+       Source/WebCore/xml/XPathFunctions.h \
+       Source/WebCore/xml/XPathNodeSet.cpp \
+       Source/WebCore/xml/XPathNodeSet.h \
+       Source/WebCore/xml/XPathNSResolver.cpp \
+       Source/WebCore/xml/XPathNSResolver.h \
+       Source/WebCore/xml/XPathParser.cpp \
+       Source/WebCore/xml/XPathParser.h \
+       Source/WebCore/xml/XPathPath.cpp \
+       Source/WebCore/xml/XPathPath.h \
+       Source/WebCore/xml/XPathPredicate.cpp \
+       Source/WebCore/xml/XPathPredicate.h \
+       Source/WebCore/xml/XPathResult.cpp \
+       Source/WebCore/xml/XPathResult.h \
+       Source/WebCore/xml/XPathStep.cpp \
+       Source/WebCore/xml/XPathStep.h \
+       Source/WebCore/xml/XPathUtil.cpp \
+       Source/WebCore/xml/XPathUtil.h \
+       Source/WebCore/xml/XPathValue.cpp \
+       Source/WebCore/xml/XPathValue.h \
+       Source/WebCore/xml/XPathVariableReference.cpp \
+       Source/WebCore/xml/XPathVariableReference.h \
+       Source/WebCore/xml/XSLImportRule.cpp \
+       Source/WebCore/xml/XSLImportRule.h \
+       Source/WebCore/xml/XSLStyleSheet.h \
+       Source/WebCore/xml/XSLStyleSheetLibxslt.cpp \
+       Source/WebCore/xml/XSLTExtensions.cpp \
+       Source/WebCore/xml/XSLTExtensions.h \
+       Source/WebCore/xml/XSLTProcessor.cpp \
+       Source/WebCore/xml/XSLTProcessor.h \
+       Source/WebCore/xml/XSLTProcessorLibxslt.cpp \
+       Source/WebCore/xml/XSLTUnicodeSort.cpp \
+       Source/WebCore/xml/XSLTUnicodeSort.h
+
+webcore_svg_sources += \
+       Source/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp \
+       Source/WebCore/bindings/js/JSSVGLengthCustom.cpp \
+       Source/WebCore/bindings/js/JSSVGPathSegCustom.cpp \
+       Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp \
+       Source/WebCore/css/SVGCSSParser.cpp \
+       Source/WebCore/css/SVGCSSStyleSelector.cpp \
+       Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp \
+       Source/WebCore/css/WebKitCSSSVGDocumentValue.h \
+       Source/WebCore/loader/cache/CachedSVGDocument.cpp \
+       Source/WebCore/loader/cache/CachedSVGDocument.h \
+       Source/WebCore/loader/cache/CachedSVGDocumentReference.h \
+       Source/WebCore/platform/graphics/SVGGlyph.cpp \
+       Source/WebCore/platform/graphics/SVGGlyph.h \
        Source/WebCore/rendering/style/SVGRenderStyle.cpp \
        Source/WebCore/rendering/style/SVGRenderStyleDefs.cpp \
        Source/WebCore/rendering/style/SVGRenderStyleDefs.h \
@@ -4613,34 +4766,6 @@ webcore_sources += \
        Source/WebCore/rendering/svg/SVGTextQuery.h \
        Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp \
        Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h \
-       Source/WebCore/rendering/TableLayout.h \
-       Source/WebCore/rendering/TrailingFloatsRootInlineBox.h \
-       Source/WebCore/storage/StorageTask.cpp \
-       Source/WebCore/storage/StorageTask.h \
-       Source/WebCore/storage/StorageThread.cpp \
-       Source/WebCore/storage/StorageThread.h \
-       Source/WebCore/storage/StorageArea.h \
-       Source/WebCore/storage/StorageAreaImpl.cpp \
-       Source/WebCore/storage/StorageAreaImpl.h \
-       Source/WebCore/storage/StorageAreaSync.cpp \
-       Source/WebCore/storage/StorageAreaSync.h \
-       Source/WebCore/storage/Storage.cpp \
-       Source/WebCore/storage/Storage.h \
-       Source/WebCore/storage/StorageEvent.cpp \
-       Source/WebCore/storage/StorageEvent.h \
-       Source/WebCore/storage/StorageEventDispatcher.cpp \
-       Source/WebCore/storage/StorageEventDispatcher.h \
-       Source/WebCore/storage/StorageMap.cpp \
-       Source/WebCore/storage/StorageMap.h \
-       Source/WebCore/storage/StorageNamespace.cpp \
-       Source/WebCore/storage/StorageNamespace.h \
-       Source/WebCore/storage/StorageNamespaceImpl.cpp \
-       Source/WebCore/storage/StorageNamespaceImpl.h \
-       Source/WebCore/storage/StorageSyncManager.cpp \
-       Source/WebCore/storage/StorageSyncManager.h \
-       Source/WebCore/storage/StorageTracker.cpp \
-       Source/WebCore/storage/StorageTracker.h \
-       Source/WebCore/storage/StorageTrackerClient.h \
        Source/WebCore/svg/animation/SMILTimeContainer.cpp \
        Source/WebCore/svg/animation/SMILTimeContainer.h \
        Source/WebCore/svg/animation/SMILTime.cpp \
@@ -5019,123 +5144,7 @@ webcore_sources += \
        Source/WebCore/svg/SVGZoomAndPan.cpp \
        Source/WebCore/svg/SVGZoomAndPan.h \
        Source/WebCore/svg/SVGZoomEvent.cpp \
-       Source/WebCore/svg/SVGZoomEvent.h \
-       Source/WebCore/WebCorePrefix.h \
-       Source/WebCore/workers/AbstractWorker.cpp \
-       Source/WebCore/workers/AbstractWorker.h \
-       Source/WebCore/workers/DedicatedWorkerContext.cpp \
-       Source/WebCore/workers/DedicatedWorkerContext.h \
-       Source/WebCore/workers/DedicatedWorkerThread.cpp \
-       Source/WebCore/workers/DedicatedWorkerThread.h \
-       Source/WebCore/workers/DefaultSharedWorkerRepository.cpp \
-       Source/WebCore/workers/DefaultSharedWorkerRepository.h \
-       Source/WebCore/workers/SharedWorkerContext.cpp \
-       Source/WebCore/workers/SharedWorkerContext.h \
-       Source/WebCore/workers/SharedWorker.cpp \
-       Source/WebCore/workers/SharedWorker.h \
-       Source/WebCore/workers/SharedWorkerRepository.h \
-       Source/WebCore/workers/SharedWorkerStrategy.h \
-       Source/WebCore/workers/SharedWorkerThread.cpp \
-       Source/WebCore/workers/SharedWorkerThread.h \
-       Source/WebCore/workers/WorkerContext.cpp \
-       Source/WebCore/workers/WorkerContext.h \
-       Source/WebCore/workers/WorkerContextProxy.h \
-       Source/WebCore/workers/WorkerEventQueue.cpp \
-       Source/WebCore/workers/WorkerEventQueue.h \
-       Source/WebCore/workers/Worker.cpp \
-       Source/WebCore/workers/Worker.h \
-       Source/WebCore/workers/WorkerLoaderProxy.h \
-       Source/WebCore/workers/WorkerLocation.cpp \
-       Source/WebCore/workers/WorkerLocation.h \
-       Source/WebCore/workers/WorkerMessagingProxy.cpp \
-       Source/WebCore/workers/WorkerMessagingProxy.h \
-       Source/WebCore/workers/WorkerObjectProxy.h \
-       Source/WebCore/workers/WorkerReportingProxy.h \
-       Source/WebCore/workers/WorkerRunLoop.cpp \
-       Source/WebCore/workers/WorkerRunLoop.h \
-       Source/WebCore/workers/WorkerScriptLoaderClient.h \
-       Source/WebCore/workers/WorkerScriptLoader.cpp \
-       Source/WebCore/workers/WorkerScriptLoader.h \
-       Source/WebCore/workers/WorkerThread.cpp \
-       Source/WebCore/workers/WorkerThread.h \
-       Source/WebCore/xml/parser/CharacterReferenceParserInlines.h \
-       Source/WebCore/xml/parser/MarkupTokenBase.h \
-       Source/WebCore/xml/parser/MarkupTokenizerBase.h \
-       Source/WebCore/xml/parser/MarkupTokenizerInlines.h \
-       Source/WebCore/xml/parser/NewXMLDocumentParser.cpp \
-       Source/WebCore/xml/parser/NewXMLDocumentParser.h \
-       Source/WebCore/xml/parser/XMLCharacterReferenceParser.cpp \
-       Source/WebCore/xml/parser/XMLCharacterReferenceParser.h \
-       Source/WebCore/xml/parser/XMLDocumentParser.cpp \
-       Source/WebCore/xml/parser/XMLDocumentParser.h \
-       Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp \
-       Source/WebCore/xml/parser/XMLDocumentParserScope.cpp \
-       Source/WebCore/xml/parser/XMLDocumentParserScope.h \
-       Source/WebCore/xml/parser/XMLTokenizer.cpp \
-       Source/WebCore/xml/parser/XMLTokenizer.h \
-       Source/WebCore/xml/parser/XMLToken.h \
-       Source/WebCore/xml/parser/XMLTreeBuilder.cpp \
-       Source/WebCore/xml/parser/XMLTreeBuilder.h \
-       Source/WebCore/xml/DOMParser.cpp \
-       Source/WebCore/xml/DOMParser.h \
-       Source/WebCore/xml/NativeXPathNSResolver.cpp \
-       Source/WebCore/xml/NativeXPathNSResolver.h \
-       Source/WebCore/xml/XMLErrors.cpp \
-       Source/WebCore/xml/XMLErrors.h \
-       Source/WebCore/xml/XMLHttpRequest.cpp \
-       Source/WebCore/xml/XMLHttpRequestException.cpp \
-       Source/WebCore/xml/XMLHttpRequestException.h \
-       Source/WebCore/xml/XMLHttpRequest.h \
-       Source/WebCore/xml/XMLHttpRequestProgressEvent.h \
-       Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp \
-       Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h \
-       Source/WebCore/xml/XMLHttpRequestUpload.cpp \
-       Source/WebCore/xml/XMLHttpRequestUpload.h \
-       Source/WebCore/xml/XMLTreeViewer.cpp \
-       Source/WebCore/xml/XMLTreeViewer.h \
-       Source/WebCore/xml/XMLSerializer.cpp \
-       Source/WebCore/xml/XMLSerializer.h \
-       Source/WebCore/xml/XPathEvaluator.cpp \
-       Source/WebCore/xml/XPathEvaluator.h \
-       Source/WebCore/xml/XPathException.cpp \
-       Source/WebCore/xml/XPathException.h \
-       Source/WebCore/xml/XPathExpression.cpp \
-       Source/WebCore/xml/XPathExpression.h \
-       Source/WebCore/xml/XPathExpressionNode.cpp \
-       Source/WebCore/xml/XPathExpressionNode.h \
-       Source/WebCore/xml/XPathFunctions.cpp \
-       Source/WebCore/xml/XPathFunctions.h \
-       Source/WebCore/xml/XPathNodeSet.cpp \
-       Source/WebCore/xml/XPathNodeSet.h \
-       Source/WebCore/xml/XPathNSResolver.cpp \
-       Source/WebCore/xml/XPathNSResolver.h \
-       Source/WebCore/xml/XPathParser.cpp \
-       Source/WebCore/xml/XPathParser.h \
-       Source/WebCore/xml/XPathPath.cpp \
-       Source/WebCore/xml/XPathPath.h \
-       Source/WebCore/xml/XPathPredicate.cpp \
-       Source/WebCore/xml/XPathPredicate.h \
-       Source/WebCore/xml/XPathResult.cpp \
-       Source/WebCore/xml/XPathResult.h \
-       Source/WebCore/xml/XPathStep.cpp \
-       Source/WebCore/xml/XPathStep.h \
-       Source/WebCore/xml/XPathUtil.cpp \
-       Source/WebCore/xml/XPathUtil.h \
-       Source/WebCore/xml/XPathValue.cpp \
-       Source/WebCore/xml/XPathValue.h \
-       Source/WebCore/xml/XPathVariableReference.cpp \
-       Source/WebCore/xml/XPathVariableReference.h \
-       Source/WebCore/xml/XSLImportRule.cpp \
-       Source/WebCore/xml/XSLImportRule.h \
-       Source/WebCore/xml/XSLStyleSheet.h \
-       Source/WebCore/xml/XSLStyleSheetLibxslt.cpp \
-       Source/WebCore/xml/XSLTExtensions.cpp \
-       Source/WebCore/xml/XSLTExtensions.h \
-       Source/WebCore/xml/XSLTProcessor.cpp \
-       Source/WebCore/xml/XSLTProcessor.h \
-       Source/WebCore/xml/XSLTProcessorLibxslt.cpp \
-       Source/WebCore/xml/XSLTUnicodeSort.cpp \
-       Source/WebCore/xml/XSLTUnicodeSort.h
+       Source/WebCore/svg/SVGZoomEvent.h
 
 webcore_platform_sources += \
        Source/WebCore/platform/animation/Animation.cpp \
@@ -5517,8 +5526,6 @@ webcore_platform_sources += \
        Source/WebCore/platform/graphics/StrokeStyleApplier.h \
        Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.cpp \
        Source/WebCore/platform/graphics/SurrogatePairAwareTextIterator.h \
-       Source/WebCore/platform/graphics/SVGGlyph.cpp \
-       Source/WebCore/platform/graphics/SVGGlyph.h \
        Source/WebCore/platform/graphics/TextRenderingMode.h \
        Source/WebCore/platform/graphics/TextRun.cpp \
        Source/WebCore/platform/graphics/TextRun.h \
index 23dbf3d..a218eed 100644 (file)
@@ -1,3 +1,15 @@
+2012-09-26  Gustavo Noronha Silva  <gns@gnome.org>
+
+        [GTK] Split SVG from WebCore to work-around make limitation
+        https://bugs.webkit.org/show_bug.cgi?id=97735
+
+        Reviewed by Carlos Garcia Campos.
+
+        Add a new libtool convenience library, libWebCoreSVG.la, to work-around
+        make limitation when linking libWebCore.
+
+        * GNUmakefile.am: link libWebCoreSVG.la into libwebkitgtk.
+
 2012-11-21  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         Disambiguate innerNodeFramePoint and mainFramePoint
index 866bba2..ba097d0 100644 (file)
@@ -76,12 +76,19 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFL
        $(version_script) \
        $(no_undefined)
 
-libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD := \
        -lpthread \
        libWebCore.la \
        libWebCorePlatform.la \
        libWebCoreModules.la \
-       libWebCoreGtk.la \
+       libWebCoreGtk.la
+
+if ENABLE_SVG
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
+       libWebCoreSVG.la
+endif
+
+libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
        $(CAIRO_LIBS) \
        $(CLUTTER_LIBS) \
index dda5c09..afca468 100644 (file)
@@ -1,3 +1,15 @@
+2012-09-26  Gustavo Noronha Silva  <gns@gnome.org>
+
+        [GTK] Split SVG from WebCore to work-around make limitation
+        https://bugs.webkit.org/show_bug.cgi?id=97735
+
+        Reviewed by Carlos Garcia Campos.
+
+        Add a new libtool convenience library, libWebCoreSVG.la, to work-around
+        make limitation when linking libWebCore.
+
+        * GNUmakefile.am: link libWebCoreSVG.la into libwebkit2gtk.
+
 2012-11-22  Simon Hausmann  <simon.hausmann@digia.com>, Pierre Rossi <pierre.rossi@digia.com>
 
         [Qt] Separate QWidget dependant code into separate WebKitWidgets static library
index dfdd49d..097cdc1 100644 (file)
@@ -159,11 +159,18 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDF
        $(version_script) \
        $(no_undefined)
 
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
+libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD := \
        -lpthread \
        libWebCore.la \
        libWebCorePlatform.la \
-       libWebCoreModules.la \
+       libWebCoreModules.la
+
+if ENABLE_SVG
+libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
+       libWebCoreSVG.la
+endif
+
+libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
        libWebCoreGtk.la \
        $(CAIRO_LIBS) \
@@ -533,7 +540,14 @@ Programs_WebKitPluginProcess_SOURCES = \
 Programs_WebKitPluginProcess_LDADD = \
        -lpthread \
        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
-       libWebCore.la \
+       libWebCore.la
+
+#if ENABLE_SVG
+Programs_WebKitPluginProcess_LDADD += \
+    libWebCoreSVG.la
+#endif
+
+Programs_WebKitPluginProcess_LDADD += \
        libWebCorePlatform.la \
        libWebCoreGtk2.la \
        $(CAIRO_LIBS) \