Permalink
Browse files

[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.

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: http://svn.webkit.org/repository/webkit/trunk@135538 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
1 parent 49b23aa commit e0b94079d00743e936e062b3ee9bfbce9cf0e0ed kov@webkit.org committed Nov 22, 2012
View
@@ -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
View
@@ -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) \
View
@@ -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.
@@ -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)
Oops, something went wrong.

0 comments on commit e0b9407

Please sign in to comment.