Title: [145711] releases/WebKitGTK/webkit-2.0
- Revision
- 145711
- Author
- carlo...@webkit.org
- Date
- 2013-03-13 06:36:28 -0700 (Wed, 13 Mar 2013)
Log Message
Merge r145395 - [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: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (145710 => 145711)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-03-13 13:30:05 UTC (rev 145710)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-03-13 13:36:28 UTC (rev 145711)
@@ -1,3 +1,14 @@
+2013-03-11 Zan Dobersek <zdober...@igalia.com>
+
+ [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-13 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Split GtkAuthenticationDialog in two widgets
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.am (145710 => 145711)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.am 2013-03-13 13:30:05 UTC (rev 145710)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.am 2013-03-13 13:36:28 UTC (rev 145711)
@@ -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@.@WEBKITGTK_API_MINOR_VERSION@.la
$(webkit2gtk_lib_for_dep): libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
+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@.@WEBKITGTK_API_MINOR_VERSION@.la libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
+plugin_process_for_dep_list = libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
+if ENABLE_WEBKIT1
+plugin_process_for_dep_list += \
+ libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
+endif
+$(plugin_process_for_dep): $(plugin_process_for_dep_list)
Programs_WebKitPluginProcess_CPPFLAGS = \
-include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
Modified: releases/WebKitGTK/webkit-2.0/Tools/ChangeLog (145710 => 145711)
--- releases/WebKitGTK/webkit-2.0/Tools/ChangeLog 2013-03-13 13:30:05 UTC (rev 145710)
+++ releases/WebKitGTK/webkit-2.0/Tools/ChangeLog 2013-03-13 13:36:28 UTC (rev 145711)
@@ -1,3 +1,16 @@
+2013-03-11 Zan Dobersek <zdober...@igalia.com>
+
+ [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-13 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Split GtkAuthenticationDialog in two widgets
Modified: releases/WebKitGTK/webkit-2.0/Tools/GNUmakefile.am (145710 => 145711)
--- releases/WebKitGTK/webkit-2.0/Tools/GNUmakefile.am 2013-03-13 13:30:05 UTC (rev 145710)
+++ releases/WebKitGTK/webkit-2.0/Tools/GNUmakefile.am 2013-03-13 13:36:28 UTC (rev 145711)
@@ -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@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ 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@.@WEBKITGTK_API_MINOR_VERSION@.la \
+docs_build_stamp_list += \
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
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@.@WEBKITGTK_API_MINOR_VERSION@.la \
- 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: releases/WebKitGTK/webkit-2.0/Tools/TestWebKitAPI/GNUmakefile.am (145710 => 145711)
--- releases/WebKitGTK/webkit-2.0/Tools/TestWebKitAPI/GNUmakefile.am 2013-03-13 13:30:05 UTC (rev 145710)
+++ releases/WebKitGTK/webkit-2.0/Tools/TestWebKitAPI/GNUmakefile.am 2013-03-13 13:36:28 UTC (rev 145711)
@@ -82,7 +82,8 @@
Libraries/libTestWebKitAPIMain.la \
Libraries/libgtest.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
- libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
+ libWebCore.la \
+ libWebCoreGtk.la \
$(FREETYPE_LIBS) \
$(GLIB_LIBS) \
$(GTK_LIBS) \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
