Don't call gcc directly when building the dftables tool but use a separate .pro file...

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

diff --git a/ChangeLog b/ChangeLog
index c117964..8149c73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-18  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Zack.
+
+        Don't call gcc directly when building the dftables tool but use a separate .pro file for the Qt build.
+
+        * WebKit.pro:
+
 2007-07-18  Timothy Hatcher  <timothy@apple.com>
 
         Add a SCRIPTS_PATH variable so Makefiles of differnet nested directories can

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b4ac567..f238ad6 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-18  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Zack.
+
+        Don't call gcc directly when building the dftables tool but use a separate .pro file for the Qt build.
+
+        * pcre/dftables.pro: Added.
+        * pcre/pcre.pri:
+
 2007-07-17  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 
         Reviewed by Darin, Maciej, and Adam.

diff --git a/JavaScriptCore/pcre/dftables.pro b/JavaScriptCore/pcre/dftables.pro
new file mode 100644 (file)
index 0000000..07940f9
--- /dev/null
+++ b/JavaScriptCore/pcre/dftables.pro
@@ -0,0 +1,15 @@
+TEMPLATE = app
+CONFIG += console
+CONFIG -= app_bundle qt
+SOURCES = dftables.c
+TARGET = dftables
+DESTDIR = tmp
+
+INCLUDEPATH += $$PWD/../wtf
+
+gdk-port {
+  DEFINES += BUILDING_GDK__ BUILDING_CAIRO__
+} else {
+  DEFINES += BUILDING_QT__
+}
+

diff --git a/JavaScriptCore/pcre/pcre.pri b/JavaScriptCore/pcre/pcre.pri
index 323c6b5..f777f59 100644 (file)
--- a/JavaScriptCore/pcre/pcre.pri
+++ b/JavaScriptCore/pcre/pcre.pri
@@ -26,9 +26,7 @@ CTGENFILE += \
 
 # GENERATOR: "chartables.c": compile and execute the chartables generator (and add it to sources)
 ctgen.output = tmp/chartables.c
-ctgen.commands = gcc ${QMAKE_FILE_NAME} -I$$PWD/../wtf -o tmp/${QMAKE_FILE_BASE} && ./tmp/${QMAKE_FILE_BASE} ${QMAKE_FILE_OUT}
-qt-port:ctgen.commands = gcc ${QMAKE_FILE_NAME} -DBUILDING_QT__ -I$$PWD/../wtf -o tmp/${QMAKE_FILE_BASE} && ./tmp/${QMAKE_FILE_BASE} ${QMAKE_FILE_OUT}
-gdk-port:ctgen.commands = gcc ${QMAKE_FILE_NAME} -DBUILDING_GDK__ -DBUILDING_CAIRO__ -I$$PWD/../wtf -o tmp/${QMAKE_FILE_BASE} && ./tmp/${QMAKE_FILE_BASE} ${QMAKE_FILE_OUT}
+ctgen.commands = tmp/dftables ${QMAKE_FILE_OUT}
 ctgen.input = CTGENFILE
 ctgen.CONFIG += target_predeps no_link
 ctgen.variable_out = GENERATED_SOURCES

diff --git a/WebKit.pro b/WebKit.pro
index 335d11e..712eead 100644 (file)
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -3,6 +3,7 @@ CONFIG += ordered
 !gdk-port:CONFIG += qt-port
 qt-port:SUBDIRS += WebKitQt/Plugins
 SUBDIRS += \
+        JavaScriptCore/pcre/dftables.pro \
         WebCore \
         JavaScriptCore/kjs/testkjs.pro