Changeset 145395 in webkit

Timestamp:

Mar 11, 2013 1:22:24 PM (11 years ago)

Author:

zandobersek@gmail.com

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.

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/GNUmakefile.am (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/GNUmakefile.am (modified) (1 diff)
• Tools/TestWebKitAPI/GNUmakefile.am (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-03-11  Zan Dobersek  <zdobersek@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-11  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -152 +152 @@
 # 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 = \
@@ -514 +516 @@
 # 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 = \

trunk/Tools/ChangeLog

@@ +1 @@
+2013-03-11  Zan Dobersek  <zdobersek@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-11  Dima Gorbik  <dgorbik@apple.com>
 

trunk/Tools/GNUmakefile.am

@@ -317 +317 @@
 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

trunk/Tools/TestWebKitAPI/GNUmakefile.am

@@ -84 +84 @@
         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) \