Changeset 84712 in webkit

Timestamp:

Apr 22, 2011 5:25:55 PM (13 years ago)

Author:

Martin Robinson

Message:

2011-04-22 Alejandro G. Castro <​alex@igalia.com> and Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Use the libWebCore.a convenience library when compiling WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=59258

• GNUmakefile.am: Remove the libWebKit2 convenience library and use the libWebCore convenience library when compiling WebKit2. Not only does this maintain the CPPFLAGS isolation, it prevents double-compilation of WebCore in some cases.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (8 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-22  Alejandro G. Castro  <alex@igalia.com> and Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Use the libWebCore.a convenience library when compiling WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=59258
+
+        * GNUmakefile.am: Remove the libWebKit2 convenience library and use the
+        libWebCore convenience library when compiling WebKit2. Not only does this
+        maintain the CPPFLAGS isolation, it prevents double-compilation of WebCore
+        in some cases.
+
 2011-04-19  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -1 @@
-# WebKit2 Convenience libraries
-noinst_LTLIBRARIES += \
-        libWebKit2.la
-
-libWebKit2_ladir = $(prefix)/include/webkit2-@WEBKITGTK_API_VERSION@/WebKit2
-libWebKit2_la_HEADERS = \
+libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
         $(WebKit2)/Shared/API/c/gtk/WKBaseGtk.h \
         $(WebKit2)/Shared/API/c/gtk/WKGraphicsContextGtk.h \
@@ -72 +67 @@
         $(WebKit2)/UIProcess/API/cpp/WKRetainPtr.h
 
-nodist_libWebKit2_la_SOURCES = \
+nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
         $(webkit2_built_sources)
 
-libWebKit2_la_SOURCES = \
+libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
         Source/WebKit/gtk/webkit/webkiterror.h \
         Source/WebKit/gtk/webkit/webkiterror.cpp \
@@ -685 +680 @@
         Source/WebKit2/WebProcess/WebProcess.h
 
-libWebKit2_la_CPPFLAGS = \
+libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
         -fno-strict-aliasing \
         $(global_cppflags) \
@@ -750 +745 @@
         $(webcore_cppflags) \
         $(webcoregtk_cppflags) \
-        $(javascriptcore_cppflags)
-
-libWebKit2_la_CXXFLAGS = \
-        $(global_cxxflags) \
-        $(libWebKit2_la_CFLAGS)
-
-libWebKit2_la_CFLAGS = \
-        $(global_cflags) \
+        $(javascriptcore_cppflags) \
         $(COVERAGE_CFLAGS) \
         $(GLIB_CFLAGS) \
@@ -765 +753 @@
         $(XT_CFLAGS)
 
-libWebKit2_la_LIBADD = \
-        -lpthread \
-        $(CAIRO_LIBS) \
-        $(COVERAGE_LDFLAGS) \
-        $(GLIB_LIBS) \
-        $(GTK_LIBS) \
-        $(LIBSOUP_LIBS) \
-        $(UNICODE_LIBS) \
-        $(XT_LIBS)
+libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
+        $(global_cxxflags)
+
+libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
+        $(global_cflags)
 
 # Shared libraries
@@ -779 +763 @@
         libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
 
-nodist_EXTRA_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-        $(webcore_built_nosources)
-
-nodist_libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-        $(webcore_built_sources)
-
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-        $(webcore_sources) \
-        $(webcoregtk_sources)
-
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
-        $(global_cxxflags)
-
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
-        $(global_cflags)
-
-# When building WebCore, we want WebCore/config.h and NOT JavaScriptCore/config.h,
-# hence, it's important that WebCore/ should come first before JavaScriptCore in the
-# include path.
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
-        -DBUILDING_WEBKIT \
-        -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-        -DDATA_DIR=\"${datadir}\" \
-        $(global_cppflags) \
-        $(webcore_cppflags) \
-        $(webcoregtk_cppflags) \
-        $(javascriptcore_cppflags) \
-        -fno-strict-aliasing \
-        $(COVERAGE_CFLAGS) \
-        $(ENCHANT_CFLAGS) \
-        $(GAIL_CFLAGS) \
-        $(GEOCLUE_CFLAGS) \
-        $(GLIB_CFLAGS) \
-        $(GSTREAMER_CFLAGS) \
-        $(GTK_CFLAGS) \
-        $(HILDON_CFLAGS) \
-        $(HILDON_CPPFLAGS) \
-        $(LIBSOUP_CFLAGS) \
-        $(LIBXML_CFLAGS) \
-        $(LIBXSLT_CFLAGS) \
-        $(SQLITE3_CFLAGS) \
-        $(UNICODE_CFLAGS) \
-        $(XT_CFLAGS)
+libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = \
+        $(prefix)/include/webkit2-@WEBKITGTK_API_VERSION@/WebKit2
 
 # For the Gtk port we want to use XP_UNIX both in X11 and Mac
@@ -837 +780 @@
         -lpthread \
         libJavaScriptCore.la \
-        libWebKit2.la \
+        libWebCore.la \
+        $(CAIRO_LIBS) \
         $(COVERAGE_LDFLAGS) \
         $(ENCHANT_LIBS) \
@@ -845 +789 @@
         $(GSTREAMER_LIBS) \
         $(GTK_LIBS) \
-        $(HILDON_LIBS) \
         $(JPEG_LIBS) \
         $(LIBSOUP_LIBS) \