2007-12-04 Michael Natterer <mitch@imendio.com>
authoralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Dec 2007 19:10:19 +0000 (19:10 +0000)
committeralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Dec 2007 19:10:19 +0000 (19:10 +0000)
        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.

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

WebCore/ChangeLog
WebCore/WebCore.pro
WebKit/gtk/ChangeLog
WebKit/gtk/WebView/webkitwebframe.cpp

index 2b9bf6598d785c4f16096e7807f10b637fd7906f..8cbe1e1044ddb38063dfc1f232afd3245f7a2f9e 100644 (file)
@@ -1,3 +1,14 @@
+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.
+
 2007-12-04  Pierre-Luc Beaudoin  <pierre-luc.beaudoin@collabora.co.uk>
 
         Reviewed by Alp Toker.
index 925fb5c7631f7b3438bb117e8d4a16e153580fa1..883846866943ee5862ea2871e5a1817115eec2b3 100644 (file)
@@ -21,6 +21,7 @@ GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR/
 win32-*: GENERATED_SOURCES_DIR_SLASH ~= s|/|\|
 
 INCLUDEPATH += $$GENERATED_SOURCES_DIR
+DEPENDPATH += $$GENERATED_SOURCES_DIR
 
 !CONFIG(QTDIR_build) {
      OBJECTS_DIR = tmp
@@ -1744,12 +1745,12 @@ gtk-port {
     #
     # integrate glib-genmarshal as additional compiler
     #
-    QMAKE_GENMARSHAL_CC  = glib-genmarshal
-    glib-genmarshal.commands = $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --header --body >${QMAKE_FILE_OUT}
-    glib-genmarshal.output = $$OUT_PWD/${QMAKE_FILE_BASE}.h
+    QMAKE_GENMARSHAL_CC = glib-genmarshal
+    glib-genmarshal.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.cpp
+    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
     glib-genmarshal.input = GENMARSHALS
-    glib-genmarshal.CONFIG = no_link
-    glib-genmarshal.variable_out = PRE_TARGETDEPS
+    glib-genmarshal.variable_out = GENERATED_SOURCES
+    glib-genmarshal.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_GENERATED_SOURCES_DIR_SLASH}${QMAKE_FILE_BASE}.h
     glib-genmarshal.name = GENMARSHALS
     QMAKE_EXTRA_UNIX_COMPILERS += glib-genmarshal
 }
index b75164c5b0cde123d0184c1ce933c977e54b05da..40c3a63f683429d9d68d0aa032878a7b17087233 100644 (file)
@@ -1,3 +1,11 @@
+2007-12-04  Michael Natterer  <mitch@imendio.com>
+
+        Reviewed by Alp Toker.
+
+        * WebView/webkitwebframe.cpp: don't redeclare the marshaller
+        prototype but simply include "webkit-marshal.h" now that its build
+        is fixed.
+
 2007-12-04  Luca Bruno  <lethalman88@gmail.com>
 
         Reviewed by Alp Toker.
index ada5d4f68d1848fd892f8a8c8d648c648df117c8..dd83087868eeaad7e1e913fa0eea936d97d4a4a3 100644 (file)
  */
 
 #include "config.h"
+
 #include "webkitwebframe.h"
 #include "webkitwebview.h"
+#include "webkit-marshal.h"
 #include "webkitprivate.h"
 
 #include "CString.h"
@@ -49,13 +51,6 @@ using namespace WebCore;
 
 extern "C" {
 
-extern void webkit_marshal_VOID__STRING_STRING (GClosure*     closure,
-                                                GValue*       return_value,
-                                                guint         n_param_values,
-                                                const GValue* param_values,
-                                                gpointer      invocation_hint,
-                                                gpointer      marshal_data);
-
 enum {
     CLEARED,
     LOAD_DONE,