Changeset 147927 in webkit


Ignore:
Timestamp:
Apr 8, 2013 10:24:50 AM (11 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] Build Platform as a separate static library
https://bugs.webkit.org/show_bug.cgi?id=114164

Reviewed by Martin Robinson.

.:

  • GNUmakefile.am: Add webkit2platform_sources definition.

Source/WebKit2:

This way we reduce a bit the amount of files compiled twice
because of the plugin process.

  • GNUmakefile.am:
  • GNUmakefile.list.am:
  • Platform/gtk/WorkQueueGtk.cpp: Remove unused header.
  • Platform/unix/SharedMemoryUnix.cpp: Ditto.
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r147906 r147927  
     12013-04-08  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Build Platform as a separate static library
     4        https://bugs.webkit.org/show_bug.cgi?id=114164
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am: Add webkit2platform_sources definition.
     9
    1102013-04-08  Zan Dobersek  <zdobersek@igalia.com>
    211
  • trunk/GNUmakefile.am

    r147724 r147927  
    9797webkit2_sources :=
    9898webkit2_built_sources :=
     99webkit2platform_sources :=
    99100webkit2gtk_h_api :=
    100101webkit2gtk_built_sources :=
  • trunk/Source/WebKit2/ChangeLog

    r147913 r147927  
     12013-04-08  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Build Platform as a separate static library
     4        https://bugs.webkit.org/show_bug.cgi?id=114164
     5
     6        Reviewed by Martin Robinson.
     7
     8        This way we reduce a bit the amount of files compiled twice
     9        because of the plugin process.
     10
     11        * GNUmakefile.am:
     12        * GNUmakefile.list.am:
     13        * Platform/gtk/WorkQueueGtk.cpp: Remove unused header.
     14        * Platform/unix/SharedMemoryUnix.cpp: Ditto.
     15
    1162013-04-08  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
    217
  • trunk/Source/WebKit2/GNUmakefile.am

    r147137 r147927  
    55lib_LTLIBRARIES += \
    66        libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
     7
     8# Static libraries
     9noinst_LTLIBRARIES += \
     10        libWebKit2Platform.la
    711
    812# We need to make sure plugin process is always built with gtk2, because plugins like flash
     
    1519        Programs/WebKitPluginProcess
    1620endif
     21
     22# Platform
     23libWebKit2Platform_la_SOURCES = \
     24        $(webkit2platform_sources)
     25
     26libWebKit2Platform_la_CXXFLAGS = \
     27        -fvisibility-inlines-hidden \
     28        $(global_cxxflags)
     29
     30libWebKit2Platform_la_CFLAGS = \
     31        -fvisibility=hidden \
     32        $(global_cflags)
     33
     34libWebKit2Platform_la_CPPFLAGS = \
     35        -DBUILDING_WEBKIT \
     36        $(global_cppflags) \
     37        -fno-strict-aliasing \
     38        -std=c++11 \
     39        -I$(srcdir)/Source \
     40        -I$(srcdir)/Source/WTF \
     41        -I$(srcdir)/Source/WebKit2/Platform \
     42        -I$(srcdir)/Source/WebKit2/Platform/CoreIPC \
     43        -I$(srcdir)/Source/WebKit2/Platform/CoreIPC/gtk \
     44        -I$(srcdir)/Source/WebKit2/Platform/gtk \
     45        -I$(top_builddir)/DerivedSources/WebKit2/include \
     46        $(COVERAGE_CFLAGS) \
     47        $(GLIB_CFLAGS)
     48
    1749
    1850libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
     
    194226        libWebCoreDOM.la \
    195227        libWebCoreGtk.la \
     228        libWebKit2Platform.la \
    196229        $(CAIRO_LIBS) \
    197230        $(CLUTTER_LIBS) \
     
    628661        libWebCoreGtk2.la \
    629662        libWebCorePlatform.la \
     663        libWebKit2Platform.la \
    630664        $(CAIRO_LIBS) \
    631665        $(COVERAGE_LDFLAGS) \
  • trunk/Source/WebKit2/GNUmakefile.list.am

    r144436 r147927  
    249249        DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h
    250250
    251 webkit2_sources += \
    252         Source/WebKit2/config.h \
     251webkit2platform_sources += \
    253252        Source/WebKit2/Platform/CoreIPC/ArgumentCoder.h \
    254253        Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp \
     
    292291        Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp \
    293292        Source/WebKit2/Platform/WorkQueue.cpp \
    294         Source/WebKit2/Platform/WorkQueue.h \
     293        Source/WebKit2/Platform/WorkQueue.h
     294
     295webkit2_sources += \
     296        Source/WebKit2/config.h \
    295297        Source/WebKit2/PluginProcess/PluginControllerProxy.cpp \
    296298        Source/WebKit2/PluginProcess/PluginControllerProxy.h \
     
    12431245
    12441246webkit2_plugin_process_sources += \
    1245         Source/WebKit2/Platform/CoreIPC/ArgumentCoder.h \
    1246         Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h \
    1247         Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp \
    1248         Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp \
    1249         Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h \
    1250         Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp \
    1251         Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.h \
    1252         Source/WebKit2/Platform/CoreIPC/Arguments.h \
    1253         Source/WebKit2/Platform/CoreIPC/Attachment.cpp \
    1254         Source/WebKit2/Platform/CoreIPC/Attachment.h \
    1255         Source/WebKit2/Platform/CoreIPC/BinarySemaphore.cpp \
    1256         Source/WebKit2/Platform/CoreIPC/BinarySemaphore.h \
    1257         Source/WebKit2/Platform/CoreIPC/Connection.cpp \
    1258         Source/WebKit2/Platform/CoreIPC/Connection.h \
    1259         Source/WebKit2/Platform/CoreIPC/DataReference.cpp \
    1260         Source/WebKit2/Platform/CoreIPC/DataReference.h \
    1261         Source/WebKit2/Platform/CoreIPC/HandleMessage.h \
    1262         Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp \
    1263         Source/WebKit2/Platform/CoreIPC/MessageDecoder.h \
    1264         Source/WebKit2/Platform/CoreIPC/MessageEncoder.cpp \
    1265         Source/WebKit2/Platform/CoreIPC/MessageEncoder.h \
    1266         Source/WebKit2/Platform/CoreIPC/MessageReceiver.h \
    1267         Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.cpp \
    1268         Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.h \
    1269         Source/WebKit2/Platform/CoreIPC/MessageSender.h \
    1270         Source/WebKit2/Platform/CoreIPC/StringReference.cpp \
    1271         Source/WebKit2/Platform/CoreIPC/StringReference.h \
    1272         Source/WebKit2/Platform/CoreIPC/unix/AttachmentUnix.cpp \
    1273         Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp \
    1274         Source/WebKit2/Platform/Module.cpp \
    1275         Source/WebKit2/Platform/Module.h \
    1276         Source/WebKit2/Platform/WorkQueue.cpp \
    1277         Source/WebKit2/Platform/WorkQueue.h \
    1278         Source/WebKit2/Platform/SharedMemory.h \
    1279         Source/WebKit2/Platform/gtk/ModuleGtk.cpp \
    1280         Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp \
    1281         Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp \
    12821247        Source/WebKit2/PluginProcess/PluginControllerProxy.cpp \
    12831248        Source/WebKit2/PluginProcess/PluginControllerProxy.h \
  • trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp

    r141599 r147927  
    2929#include "WorkQueue.h"
    3030
    31 #include "WKBase.h"
    3231#include <gio/gio.h>
    3332#include <glib.h>
  • trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp

    r143062 r147927  
    3232#include "ArgumentDecoder.h"
    3333#include "ArgumentEncoder.h"
    34 #include "WebCoreArgumentCoders.h"
    3534#include <errno.h>
    3635#include <fcntl.h>
Note: See TracChangeset for help on using the changeset viewer.