- Revision
- 116205
- Author
- [email protected]
- Date
- 2012-05-04 20:35:51 -0700 (Fri, 04 May 2012)
Log Message
[GTK] Simplify how libWebCoreModules is linked in, and fix WebKit2 build
https://bugs.webkit.org/show_bug.cgi?id=85691
Source/WebCore:
* GNUmakefile.am: link libWebCoreModules into libWebCore.
Source/WebKit/gtk:
* GNUmakefile.am: no longer link libwebkitgtk to libWebCoreModules.
Source/WebKit2:
* GNUmakefile.am: no longer link libWebCoreModules, and remove -no-
fast-install and -no-install from link flags, since we want those
programs installed.
Tools:
* GNUmakefile.am: no longer link libWebCoreModules to DumpRenderTree.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (116204 => 116205)
--- trunk/Source/WebCore/ChangeLog 2012-05-05 02:54:04 UTC (rev 116204)
+++ trunk/Source/WebCore/ChangeLog 2012-05-05 03:35:51 UTC (rev 116205)
@@ -1,3 +1,10 @@
+2012-05-04 Gustavo Noronha Silva <[email protected]>
+
+ [GTK] Simplify how libWebCoreModules is linked in, and fix WebKit2 build
+ https://bugs.webkit.org/show_bug.cgi?id=85691
+
+ * GNUmakefile.am: link libWebCoreModules into libWebCore.
+
2012-05-04 Kent Tamura <[email protected]>
Rename ICULocale to LocaleICU, part 1
Modified: trunk/Source/WebCore/GNUmakefile.am (116204 => 116205)
--- trunk/Source/WebCore/GNUmakefile.am 2012-05-05 02:54:04 UTC (rev 116204)
+++ trunk/Source/WebCore/GNUmakefile.am 2012-05-05 03:35:51 UTC (rev 116205)
@@ -903,6 +903,9 @@
$(XRENDER_CFLAGS) \
$(XT_CFLAGS)
+libWebCore_la_LIBADD = \
+ libWebCoreModules.la
+
libWebCoreModules_la_SOURCES = \
$(webcore_modules_sources)
Modified: trunk/Source/WebKit/gtk/ChangeLog (116204 => 116205)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-05-05 02:54:04 UTC (rev 116204)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-05-05 03:35:51 UTC (rev 116205)
@@ -1,3 +1,10 @@
+2012-05-04 Gustavo Noronha Silva <[email protected]>
+
+ [GTK] Simplify how libWebCoreModules is linked in, and fix WebKit2 build
+ https://bugs.webkit.org/show_bug.cgi?id=85691
+
+ * GNUmakefile.am: no longer link libwebkitgtk to libWebCoreModules.
+
2012-05-04 Sudarsana Nagineni <[email protected]>
[GTK] DRT needs an implementation of LayoutTestController::setDefersLoading and ::goBack
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (116204 => 116205)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2012-05-05 02:54:04 UTC (rev 116204)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2012-05-05 03:35:51 UTC (rev 116205)
@@ -77,7 +77,6 @@
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
-lpthread \
libWebCore.la \
- libWebCoreModules.la \
libWebCoreGtk.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
$(CAIRO_LIBS) \
Modified: trunk/Source/WebKit2/ChangeLog (116204 => 116205)
--- trunk/Source/WebKit2/ChangeLog 2012-05-05 02:54:04 UTC (rev 116204)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-05 03:35:51 UTC (rev 116205)
@@ -1,3 +1,12 @@
+2012-05-04 Gustavo Noronha Silva <[email protected]>
+
+ [GTK] Simplify how libWebCoreModules is linked in, and fix WebKit2 build
+ https://bugs.webkit.org/show_bug.cgi?id=85691
+
+ * GNUmakefile.am: no longer link libWebCoreModules, and remove -no-
+ fast-install and -no-install from link flags, since we want those
+ programs installed.
+
2012-05-04 Mark Rowe <[email protected]>
Fix a leak in WebProcess when it is used to launch the UI process.
Modified: trunk/Source/WebKit2/GNUmakefile.am (116204 => 116205)
--- trunk/Source/WebKit2/GNUmakefile.am 2012-05-05 02:54:04 UTC (rev 116204)
+++ trunk/Source/WebKit2/GNUmakefile.am 2012-05-05 03:35:51 UTC (rev 116205)
@@ -1165,7 +1165,6 @@
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
-lpthread \
libWebCore.la \
- libWebCoreModules.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
libWebCoreGtk.la \
$(CAIRO_LIBS) \
@@ -1362,10 +1361,6 @@
$(GTK_UNIX_PRINTING_LIBS) \
$(LIBSOUP_LIBS)
-Programs_WebKitWebProcess_LDFLAGS = \
- -no-fast-install \
- -no-install
-
# PluginProcess
if ENABLE_PLUGIN_PROCESS
@@ -1562,14 +1557,14 @@
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h \
Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp \
Source/WebKit2/gtk/PluginMainGtk.cpp
+
Programs_WebKitPluginProcess_SOURCES = \
$(webkit2_plugin_process_sources)
Programs_WebKitPluginProcess_LDADD = \
-lpthread \
- libWebCore.la \
- libWebCoreModules.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
+ libWebCore.la \
libWebCoreGtk2.la \
$(CAIRO_LIBS) \
$(COVERAGE_LDFLAGS) \
@@ -1593,10 +1588,6 @@
$(WINMM_LIBS) \
$(ZLIB_LIBS)
-Programs_WebKitPluginProcess_LDFLAGS = \
- -no-fast-install \
- -no-install
-
Programs_WebKitPluginProcess_CXXFLAGS = \
$(SYMBOL_VISIBILITY_INLINES) \
$(global_cxxflags)
Modified: trunk/Tools/ChangeLog (116204 => 116205)
--- trunk/Tools/ChangeLog 2012-05-05 02:54:04 UTC (rev 116204)
+++ trunk/Tools/ChangeLog 2012-05-05 03:35:51 UTC (rev 116205)
@@ -1,3 +1,10 @@
+2012-05-04 Gustavo Noronha Silva <[email protected]>
+
+ [GTK] Simplify how libWebCoreModules is linked in, and fix WebKit2 build
+ https://bugs.webkit.org/show_bug.cgi?id=85691
+
+ * GNUmakefile.am: no longer link libWebCoreModules to DumpRenderTree.
+
2012-05-04 Eric Seidel <[email protected]>
Make capitalization and descriptions in FeatureList.pm more consistent to make easier to autogenerate
Modified: trunk/Tools/GNUmakefile.am (116204 => 116205)
--- trunk/Tools/GNUmakefile.am 2012-05-05 02:54:04 UTC (rev 116204)
+++ trunk/Tools/GNUmakefile.am 2012-05-05 03:35:51 UTC (rev 116205)
@@ -158,7 +158,6 @@
Programs_DumpRenderTree_LDADD = \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
- libWebCoreModules.la \
libWebCoreInternals.la \
$(GLOBALDEPS_LIBS) \
$(CAIRO_LIBS) \
