Changeset 28396 in webkit


Ignore:
Timestamp:
Dec 4, 2007 11:10:19 AM (16 years ago)
Author:
alp@webkit.org
Message:

2007-12-04 Michael Natterer <​mitch@imendio.com>

Reviewed by Alp Toker.

  • WebCore.pro: fix build of webkit-marshal by building the functions into a separate .cpp file instead of including them in the header. This way we can use the marshallers from more than one file without using bad hacks.

Add the generated sources directory to DEPENDPATH.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r28389 r28396  
     12007-12-04  Michael Natterer  <mitch@imendio.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        * WebCore.pro: fix build of webkit-marshal by building the
     6        functions into a separate .cpp file instead of including them in
     7        the header. This way we can use the marshallers from more than one
     8        file without using bad hacks.
     9
     10        Add the generated sources directory to DEPENDPATH.
     11
    1122007-12-04  Pierre-Luc Beaudoin  <pierre-luc.beaudoin@collabora.co.uk>
    213

  • trunk/WebCore/WebCore.pro

    r28389 r28396  
    2222
    2323INCLUDEPATH += $$GENERATED_SOURCES_DIR
     24DEPENDPATH += $$GENERATED_SOURCES_DIR
    2425
    2526!CONFIG(QTDIR_build) {
    … …  
    17451746    # integrate glib-genmarshal as additional compiler
    17461747    #
    1747     QMAKE_GENMARSHAL_CC  = glib-genmarshal
    1748     glib-genmarshal.commands = $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --header --body >${QMAKE_FILE_OUT}
    1749     glib-genmarshal.output = $$OUT_PWD/${QMAKE_FILE_BASE}.h
     1748    QMAKE_GENMARSHAL_CC = glib-genmarshal
     1749    glib-genmarshal.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.cpp
     1750    glib-genmarshal.commands = echo 'extern \\"C\\" {' > ${QMAKE_FILE_OUT} && $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --body >> ${QMAKE_FILE_OUT} && echo '}' >> ${QMAKE_FILE_OUT} && $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --header > $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h
    17501751    glib-genmarshal.input = GENMARSHALS
    1751     glib-genmarshal.CONFIG = no_link
    1752     glib-genmarshal.variable_out = PRE_TARGETDEPS
     1752    glib-genmarshal.variable_out = GENERATED_SOURCES
     1753    glib-genmarshal.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_GENERATED_SOURCES_DIR_SLASH}${QMAKE_FILE_BASE}.h
    17531754    glib-genmarshal.name = GENMARSHALS
    17541755    QMAKE_EXTRA_UNIX_COMPILERS += glib-genmarshal

  • trunk/WebKit/gtk/ChangeLog

    r28388 r28396  
     12007-12-04  Michael Natterer  <mitch@imendio.com>
     2
     3        Reviewed by Alp Toker.
     4
     5        * WebView/webkitwebframe.cpp: don't redeclare the marshaller
     6        prototype but simply include "webkit-marshal.h" now that its build
     7        is fixed.
     8
    192007-12-04  Luca Bruno  <lethalman88@gmail.com>
    210

  • trunk/WebKit/gtk/WebView/webkitwebframe.cpp

    r28384 r28396  
    2929
    3030#include "config.h"
     31
    3132#include "webkitwebframe.h"
    3233#include "webkitwebview.h"
     34#include "webkit-marshal.h"
    3335#include "webkitprivate.h"
    3436
    … …  
    4951
    5052extern "C" {
    51 
    52 extern void webkit_marshal_VOID__STRING_STRING (GClosure*     closure,
    53                                                 GValue*       return_value,
    54                                                 guint         n_param_values,
    55                                                 const GValue* param_values,
    56                                                 gpointer      invocation_hint,
    57                                                 gpointer      marshal_data);
    5853
    5954enum {
Note: See TracChangeset for help on using the changeset viewer.