2007-12-04 Alp Toker <alp@atoker.com>
authoralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Dec 2007 02:48:16 +0000 (02:48 +0000)
committeralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Dec 2007 02:48:16 +0000 (02:48 +0000)
        Potential GTK+ build fix for the glib-genmarshal issue.

        Split the glib-genmarshal qmake generator in two; one for the source
        file, another for the header.

        * WebCore.pro:

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

WebCore/ChangeLog
WebCore/WebCore.pro

index dc78571bdf2edca6d1235205010c1b7ba82d5521..1b31edc073d843c3fd6e56697f533130e55094bf 100644 (file)
@@ -1,3 +1,12 @@
+2007-12-04  Alp Toker  <alp@atoker.com>
+
+        Potential GTK+ build fix for the glib-genmarshal issue.
+
+        Split the glib-genmarshal qmake generator in two; one for the source
+        file, another for the header.
+
+        * WebCore.pro:
+
 2007-12-04  Alp Toker  <alp@atoker.com>
 
         GTK+ build fix.
index 883846866943ee5862ea2871e5a1817115eec2b3..1645cc937f79219fd81e61ad9d0ba1bbf0ac1144 100644 (file)
@@ -1747,10 +1747,16 @@ gtk-port {
     #
     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.commands = echo 'extern \\"C\\" {' > ${QMAKE_FILE_OUT} && $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --body >> ${QMAKE_FILE_OUT} && echo '}' >> ${QMAKE_FILE_OUT}
     glib-genmarshal.input = GENMARSHALS
     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
+
+    glib-genmarshalh.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h
+    glib-genmarshalh.commands = $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --header > $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h
+    glib-genmarshalh.input = GENMARSHALS
+    glib-genmarshalh.variable_out = GENERATED_SOURCES
+    glib-genmarshalh.name = GENMARSHALS
+    QMAKE_EXTRA_UNIX_COMPILERS += glib-genmarshalh
 }