[GTK] WebKitGTK+ is linking against libxslt in too many places
authorberto@igalia.com <berto@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Sep 2013 16:12:31 +0000 (16:12 +0000)
committerberto@igalia.com <berto@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Sep 2013 16:12:31 +0000 (16:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=121356

Reviewed by Martin Robinson.

Source/WebCore:

Don't use LIBXSLT_CFLAGS when compiling libWebCorePlatform and
libWebCoreGtk, no source files use libxslt there.

* GNUmakefile.am:

Source/WebKit/gtk:

Don't use LIBXSLT_CFLAGS when compiling libwebkitgtk, no source
files use libxslt there.

The webkit tests don't use libxslt, so we shouldn't link against
it.

* GNUmakefile.am:

Source/WebKit2:

Don't use LIBXSLT_CFLAGS when compiling libWebCoreGtk2, no source
files use libxslt there.

* GNUmakefile.am:

Tools:

TestWebCore, WebKitTestRunner and MiniBrowser don't use libxslt,
so we don't need to link against it.

* MiniBrowser/gtk/GNUmakefile.am:
* TestWebKitAPI/GNUmakefile.am:
* WebKitTestRunner/GNUmakefile.am:

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

Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/GNUmakefile.am
Source/WebKit2/ChangeLog
Source/WebKit2/GNUmakefile.am
Tools/ChangeLog
Tools/MiniBrowser/gtk/GNUmakefile.am
Tools/TestWebKitAPI/GNUmakefile.am
Tools/WebKitTestRunner/GNUmakefile.am

index 16d504d..e48c807 100644 (file)
@@ -1,3 +1,15 @@
+2013-09-14  Alberto Garcia  <berto@igalia.com>
+
+        [GTK] WebKitGTK+ is linking against libxslt in too many places
+        https://bugs.webkit.org/show_bug.cgi?id=121356
+
+        Reviewed by Martin Robinson.
+
+        Don't use LIBXSLT_CFLAGS when compiling libWebCorePlatform and
+        libWebCoreGtk, no source files use libxslt there.
+
+        * GNUmakefile.am:
+
 2013-09-14  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: InjectedScriptSource_js and InjectedScriptCanvasModuleSource_js should be minified
index b5bbb56..232fa16 100644 (file)
@@ -543,7 +543,6 @@ libWebCorePlatform_la_CPPFLAGS = \
        $(LIBSECRET_CFLAGS) \
        $(LIBSOUP_CFLAGS) \
        $(LIBXML_CFLAGS) \
-       $(LIBXSLT_CFLAGS) \
        $(PANGO_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(UNICODE_CFLAGS) \
@@ -591,7 +590,6 @@ libWebCoreGtk_la_CPPFLAGS = \
        $(LIBSECRET_CFLAGS) \
        $(LIBSOUP_CFLAGS) \
        $(LIBXML_CFLAGS) \
-       $(LIBXSLT_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(UNICODE_CFLAGS) \
        $(XCOMPOSITE_CFLAGS) \
index 64875b7..cb89d89 100644 (file)
@@ -1,3 +1,18 @@
+2013-09-14  Alberto Garcia  <berto@igalia.com>
+
+        [GTK] WebKitGTK+ is linking against libxslt in too many places
+        https://bugs.webkit.org/show_bug.cgi?id=121356
+
+        Reviewed by Martin Robinson.
+
+        Don't use LIBXSLT_CFLAGS when compiling libwebkitgtk, no source
+        files use libxslt there.
+
+        The webkit tests don't use libxslt, so we shouldn't link against
+        it.
+
+        * GNUmakefile.am:
+
 2013-09-13  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
 
         [GTK] Move to the new web inspector
index 028d4b3..b6731d7 100644 (file)
@@ -64,7 +64,6 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPF
        $(GTK_CFLAGS) \
        $(LIBSOUP_CFLAGS) \
        $(LIBXML_CFLAGS) \
-       $(LIBXSLT_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(UNICODE_CFLAGS) \
        $(XCOMPOSITE_CFLAGS) \
@@ -440,7 +439,6 @@ webkit_tests_ldadd = \
        $(GTK_LIBS) \
        $(GLIB_LIBS) \
        $(LIBSOUP_LIBS) \
-       $(LIBXSLT_LIBS) \
        $(XRENDER_LIBS)
 
 webkit_tests_ldflags = \
index 029d99c..85a1b7c 100644 (file)
@@ -1,3 +1,15 @@
+2013-09-14  Alberto Garcia  <berto@igalia.com>
+
+        [GTK] WebKitGTK+ is linking against libxslt in too many places
+        https://bugs.webkit.org/show_bug.cgi?id=121356
+
+        Reviewed by Martin Robinson.
+
+        Don't use LIBXSLT_CFLAGS when compiling libWebCoreGtk2, no source
+        files use libxslt there.
+
+        * GNUmakefile.am:
+
 2013-09-13  Ryuan Choi  <ryuan.choi@samsung.com>
 
         Unreviewed build fix attempt for WK2 build.
index 6ba884f..adc60c1 100644 (file)
@@ -513,7 +513,6 @@ libWebCoreGtk2_la_CPPFLAGS = \
        $(LIBSECRET_CFLAGS) \
        $(LIBSOUP_CFLAGS) \
        $(LIBXML_CFLAGS) \
-       $(LIBXSLT_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(UNICODE_CFLAGS) \
        $(XRENDER_CFLAGS) \
index 9e31983..04c3214 100644 (file)
@@ -1,3 +1,17 @@
+2013-09-14  Alberto Garcia  <berto@igalia.com>
+
+        [GTK] WebKitGTK+ is linking against libxslt in too many places
+        https://bugs.webkit.org/show_bug.cgi?id=121356
+
+        Reviewed by Martin Robinson.
+
+        TestWebCore, WebKitTestRunner and MiniBrowser don't use libxslt,
+        so we don't need to link against it.
+
+        * MiniBrowser/gtk/GNUmakefile.am:
+        * TestWebKitAPI/GNUmakefile.am:
+        * WebKitTestRunner/GNUmakefile.am:
+
 2013-09-14  Ross Burton  <ross.burton@intel.com>
 
         Uses gtk-doc tools even when --disable-gtk-doc passed
index e35cab8..b1b995a 100644 (file)
@@ -40,7 +40,6 @@ Programs_MiniBrowser_LDADD = \
        $(FREETYPE_LIBS) \
        $(GLIB_LIBS) \
        $(GTK_LIBS) \
-       $(LIBXSLT_LIBS) \
        $(LIBSOUP_LIBS)
 
 Programs_MiniBrowser_LDFLAGS = \
index c69dafc..3b86b93 100644 (file)
@@ -150,7 +150,6 @@ Programs_TestWebKitAPI_TestWebCore_LDADD = \
        $(LIBSECRET_LIBS) \
        $(LIBSOUP_LIBS) \
        $(LIBXML_LIBS) \
-       $(LIBXSLT_LIBS) \
        $(OPENGL_LIBS) \
        $(PANGO_LIBS) \
        $(PNG_LIBS) \
index 70b4aae..bd04f4d 100644 (file)
@@ -59,7 +59,6 @@ Programs_WebKitTestRunner_LDADD = \
        $(FREETYPE_LIBS) \
        $(WINMM_LIBS) \
        $(XRENDER_LIBS) \
-       $(LIBXSLT_LIBS) \
        $(XT_LIBS)
 
 Programs_WebKitTestRunner_LDFLAGS = \