Title: [145395] trunk
- Revision
- 145395
- Author
- [email protected]
- Date
- 2013-03-11 13:22:24 -0700 (Mon, 11 Mar 2013)
Log Message
[GTK] WebKit2-only build fails
https://bugs.webkit.org/show_bug.cgi?id=112033
Reviewed by Gustavo Noronha Silva.
Source/WebKit2:
* GNUmakefile.am: Introduce the artifical dependency of libwebkit2gtk on libwebkitgtk only
if building WebKit1 as well. Similarly with the WebKitPluginProcess, depend on libwebkitgtk
only if building WebKit1, the dependency is otherwise not necessary.
Tools:
* GNUmakefile.am: Split the list of files the docs-build.stamp target depends on into the
generic part, WebKit1-specific part and WebKit2-specific part.
* TestWebKitAPI/GNUmakefile.am: The TestGtk executable should not link agains libwebkitgtk
as it is not WebKit1-specific, but should rather link to libWebCore.la and libWebCoreGtk.la
directly.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (145394 => 145395)
--- trunk/Source/WebKit2/ChangeLog 2013-03-11 20:17:33 UTC (rev 145394)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-11 20:22:24 UTC (rev 145395)
@@ -1,3 +1,14 @@
+2013-03-11 Zan Dobersek <[email protected]>
+
+ [GTK] WebKit2-only build fails
+ https://bugs.webkit.org/show_bug.cgi?id=112033
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Introduce the artifical dependency of libwebkit2gtk on libwebkitgtk only
+ if building WebKit1 as well. Similarly with the WebKitPluginProcess, depend on libwebkitgtk
+ only if building WebKit1, the dependency is otherwise not necessary.
+
2013-03-11 Tim Horton <[email protected]>
[wk2] Search With [your search provider here] should use NSPerformService in WebKit2/Mac
Modified: trunk/Source/WebKit2/GNUmakefile.am (145394 => 145395)
--- trunk/Source/WebKit2/GNUmakefile.am 2013-03-11 20:17:33 UTC (rev 145394)
+++ trunk/Source/WebKit2/GNUmakefile.am 2013-03-11 20:22:24 UTC (rev 145395)
@@ -151,8 +151,10 @@
# Artificial dependency to make sure libwebkit2gtk and libwebkitgtk are not linked at the same time
# The variable creation is to avoid having automake override the entire rule instead of adding the
# dependency.
+if ENABLE_WEBKIT1
webkit2gtk_lib_for_dep = libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
$(webkit2gtk_lib_for_dep): libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+endif
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = \
$(libwebkit2gtkincludedir)/WebKit2
@@ -513,7 +515,12 @@
# Serialize linking of the plugin process with both webkit libraries.
plugin_process_for_dep = Programs/WebKitPluginProcess
-$(plugin_process_for_dep): libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+plugin_process_for_dep_list = libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+if ENABLE_WEBKIT1
+plugin_process_for_dep_list += \
+ libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+endif
+$(plugin_process_for_dep): $(plugin_process_for_dep_list)
Programs_WebKitPluginProcess_CPPFLAGS = \
-include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
Modified: trunk/Tools/ChangeLog (145394 => 145395)
--- trunk/Tools/ChangeLog 2013-03-11 20:17:33 UTC (rev 145394)
+++ trunk/Tools/ChangeLog 2013-03-11 20:22:24 UTC (rev 145395)
@@ -1,3 +1,16 @@
+2013-03-11 Zan Dobersek <[email protected]>
+
+ [GTK] WebKit2-only build fails
+ https://bugs.webkit.org/show_bug.cgi?id=112033
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Split the list of files the docs-build.stamp target depends on into the
+ generic part, WebKit1-specific part and WebKit2-specific part.
+ * TestWebKitAPI/GNUmakefile.am: The TestGtk executable should not link agains libwebkitgtk
+ as it is not WebKit1-specific, but should rather link to libWebCore.la and libWebCoreGtk.la
+ directly.
+
2013-03-11 Dima Gorbik <[email protected]>
Adding myself to the committers list.
Modified: trunk/Tools/GNUmakefile.am (145394 => 145395)
--- trunk/Tools/GNUmakefile.am 2013-03-11 20:17:33 UTC (rev 145394)
+++ trunk/Tools/GNUmakefile.am 2013-03-11 20:22:24 UTC (rev 145395)
@@ -316,26 +316,26 @@
.PHONY : docs
DISTCLEANFILES += docs-build.stamp
+docs_build_stamp_list = \
+ Source/WebKit/gtk/docs/webkitenvironment.xml
+
+if ENABLE_WEBKIT1
+docs_build_stamp_list += \
+ libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
+ Source/WebKit/gtk/docs/webkitgtk-docs.sgml \
+ Source/WebKit/gtk/docs/webkitgtk-sections.txt
+endif
+
if ENABLE_WEBKIT2
-docs-build.stamp: \
- Source/WebKit/gtk/docs/webkitenvironment.xml \
- Source/WebKit/gtk/docs/webkitgtk-docs.sgml \
- Source/WebKit/gtk/docs/webkitgtk-sections.txt \
- libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
+docs_build_stamp_list += \
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml \
Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt
+endif
+
+docs-build.stamp: $(doc_build_stamp_list)
CC=$(CC) $(srcdir)/Tools/gtk/generate-gtkdoc
@touch docs-build.stamp
-else
-docs-build.stamp: \
- libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
- Source/WebKit/gtk/docs/webkitenvironment.xml \
- Source/WebKit/gtk/docs/webkitgtk-docs.sgml \
- Source/WebKit/gtk/docs/webkitgtk-sections.txt
- CC=$(CC) $(srcdir)/Tools/gtk/generate-gtkdoc
- @touch docs-build.stamp
-endif
clean-local: doc-clean-local
doc-clean-local:
Modified: trunk/Tools/TestWebKitAPI/GNUmakefile.am (145394 => 145395)
--- trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-03-11 20:17:33 UTC (rev 145394)
+++ trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-03-11 20:22:24 UTC (rev 145395)
@@ -83,7 +83,8 @@
Libraries/libTestWebKitAPIMain.la \
Libraries/libgtest.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
- libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
+ libWebCore.la \
+ libWebCoreGtk.la \
$(FREETYPE_LIBS) \
$(GLIB_LIBS) \
$(GTK_LIBS) \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
