diff --git a/Source/Platform/ChangeLog b/Source/Platform/ChangeLog index 100965e2fe8ab404d0874a68ae282af4f6a57826..d86694ec328e4ff53b158fba280a2354572d53c2 100644 --- a/Source/Platform/ChangeLog +++ b/Source/Platform/ChangeLog @@ -1,3 +1,13 @@ +2013-03-13 Zan Dobersek + + [GTK] Build fixes after 145552 + https://bugs.webkit.org/show_bug.cgi?id=112267 + + Reviewed by Gustavo Noronha Silva. + + * GNUmakefile.am: Include the same-level GNUmakefile.list.am. + Fix a typo in the inline visibility compiler flag. + 2013-03-12 Adam Barth [Chromium] Remove last vestigates of WEBKIT_USING_V8 diff --git a/Source/Platform/GNUmakefile.am b/Source/Platform/GNUmakefile.am index e45598b823934a25af6056e49b1653f21171b935..5f960cb45fa5a493fa3a014ed1c65f2bf126fc9c 100644 --- a/Source/Platform/GNUmakefile.am +++ b/Source/Platform/GNUmakefile.am @@ -6,6 +6,8 @@ # For now we only build the libPlatformGtk library as there are no source files in place yet # that could be built into libPlatform. +include $(srcdir)/Source/Platform/GNUmakefile.list.am + platformgtk_cppflags += \ -DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \ -I$(srcdir)/Source/Platform/gtk @@ -17,7 +19,7 @@ libPlatformGtk_la_SOURCES = \ $(platformgtk_sources) libPlatformGtk_la_CXXFLAGS = \ - -fvisibility-inlines-hidder \ + -fvisibility-inlines-hidden \ $(global_cxxflags) libPlatformGtk_la_CFLAGS = \ diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index bccbea7467aa4c8574ddc128e73be8fccc3c81ab..d7ec13d9c0452598226ef65d303ae47ad0c25851 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,14 @@ +2013-03-13 Zan Dobersek + + [GTK] Build fixes after 145552 + https://bugs.webkit.org/show_bug.cgi?id=112267 + + Reviewed by Gustavo Noronha Silva. + + * GNUmakefile.am: Narrow down the dependency CFLAGS list to only ones that are actually needed + to build the platformgtk_sources into libPlatformGtk2.la. At the moment this means only + GTK+-2.0 CFLAGS are used. + 2013-03-13 Antoine Quint Calling WebInspectorClient::highlight() during a fade-out animation of the PageOverlay won't stop its animation diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am index 6d56d7c0242ed08822300b4e39987e0c790a607c..88f34577e9d95c4a6760eb673802ffaf5c877cc6 100644 --- a/Source/WebKit2/GNUmakefile.am +++ b/Source/WebKit2/GNUmakefile.am @@ -507,27 +507,7 @@ libPlatformGtk2_la_CPPFLAGS = \ $(platformgtk_cppflags) \ $(javascriptcore_cppflags) \ -fno-strict-aliasing \ - $(CAIRO_CFLAGS) \ - $(CLUTTER_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(ENCHANT_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(GAIL_CFLAGS) \ - $(GAMEPAD_CFLAGS) \ - $(GEOCLUE_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(GTK_CFLAGS) \ - $(LIBSECRET_CFLAGS) \ - $(LIBSOUP_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(LIBXSLT_CFLAGS) \ - $(SQLITE3_CFLAGS) \ - $(UNICODE_CFLAGS) \ - $(XCOMPOSITE_CFLAGS) \ - $(XDAMAGE_CFLAGS) \ - $(XRENDER_CFLAGS) \ - $(XT_CFLAGS) + $(GTK2_CFLAGS) # Injected Bundle injectedbundledir = $(libdir)/webkit2gtk-3.0/injected-bundle