[GTK] WebKit2-only build fails
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Mar 2013 20:22:24 +0000 (20:22 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Mar 2013 20:22:24 +0000 (20:22 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@145395 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/GNUmakefile.am
Tools/ChangeLog
Tools/GNUmakefile.am
Tools/TestWebKitAPI/GNUmakefile.am

index 854a672..e7e9668 100644 (file)
@@ -1,3 +1,14 @@
+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>
 
         [wk2] Search With [your search provider here] should use NSPerformService in WebKit2/Mac
index 0abf96e..4d7bc2c 100644 (file)
@@ -151,8 +151,10 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFL
 # 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 @@ libwebkit2gtkinjectedbundle_la_CPPFLAGS = \
 
 # 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 \
index 5e0140d..032fafe 100644 (file)
@@ -1,3 +1,16 @@
+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>
 
         Adding myself to the committers list.
index 8529556..80ae226 100644 (file)
@@ -316,26 +316,26 @@ docs: docs-build.stamp
 .PHONY : docs
 DISTCLEANFILES += docs-build.stamp
 
-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 \
+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_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:
index 0165345..62931f7 100644 (file)
@@ -83,7 +83,8 @@ Programs_TestWebKitAPI_TestGtk_LDADD = \
        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) \