fix make clean in the qt build to remove all generated files

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 60ad0f18092a6b6866eb74939a88269dcec77e04..a49e223a0c92ab2d8bf714801ea39b1ce9b85ef7 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-18  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Zack.
+
+        * JavaScriptCore.pro: Remove generated files on make clean.
+        * pcre/pcre.pri:
+
 2007-01-16  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Maciej.

diff --git a/JavaScriptCore/JavaScriptCore.pro b/JavaScriptCore/JavaScriptCore.pro
index 5f433acfd482822b842eab5e3f09746cc2246002..3bc64c88933f20b50bd96735e1d29b574b2c4ff4 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.pro
+++ b/JavaScriptCore/JavaScriptCore.pro
@@ -113,4 +113,5 @@ kjsbison.input = KJSBISON
 kjsbison.variable_out = GENERATED_SOURCES
 kjsbison.dependency_type = TYPE_C
 kjsbison.CONFIG = target_predeps
+kjsbison.clean = ${QMAKE_FILE_OUT} tmp/${QMAKE_FILE_BASE}.h
 QMAKE_EXTRA_COMPILERS += kjsbison

diff --git a/JavaScriptCore/pcre/pcre.pri b/JavaScriptCore/pcre/pcre.pri
index 651de2fb33a7d16668a7edc3cc306e6fbb78b97f..5d5dc5654e0110be79be64a7abec9410544cb2fe 100644 (file)
--- a/JavaScriptCore/pcre/pcre.pri
+++ b/JavaScriptCore/pcre/pcre.pri
@@ -31,4 +31,5 @@ ctgen.input = CTGENFILE
 ctgen.CONFIG += target_predeps no_link
 ctgen.variable_out = GENERATED_SOURCES
 ctgen.dependency_type = TYPE_C
+ctgen.clean = ${QMAKE_FILE_OUT} tmp/${QMAKE_FILE_BASE}
 QMAKE_EXTRA_COMPILERS += ctgen

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1ea033bfefc6b95f372125f9884d277c6bfd970a..a800169ac1e83016336e12ff173b749c435ec833 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-18  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Zack.
+
+        * WebCore.pro: Remove generated files on make clean.
+
 2007-01-17  Alice Liu  <alice.liu@apple.com>
 
         Reviewed by Harrison.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index fa05a6b611eca407b231bedac065b9ad5a68f62b..878b20984c3b48e0bc0a9a34fc4d6f705179b258 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1019,6 +1019,7 @@ contains(DEFINES, SVG_SUPPORT=1) {
         svgnames_a.dependency_type = TYPE_C
         svgnames_a.CONFIG = target_predeps
         svgnames_a.variable_out = GENERATED_SOURCES
+        svgnames_a.clean = ${QMAKE_FILE_OUT} tmp/SVGNames.h
         QMAKE_EXTRA_COMPILERS += svgnames_a
         svgnames_b.output = tmp/SVGElementFactory.cpp
         svgnames_b.commands = @echo -n ''
@@ -1026,6 +1027,7 @@ contains(DEFINES, SVG_SUPPORT=1) {
         svgnames_b.depends = tmp/SVGNames.cpp
         svgnames_b.CONFIG = target_predeps
         svgnames_b.variable_out = GENERATED_SOURCES
+        svgnames_b.clean += tmp/SVGElementFactory.h ${QMAKE_FILE_OUT}
         QMAKE_EXTRA_COMPILERS += svgnames_b
 
         # GENERATOR 5-C:
@@ -1035,6 +1037,7 @@ contains(DEFINES, SVG_SUPPORT=1) {
         xlinknames.dependency_type = TYPE_C
         xlinknames.CONFIG = target_predeps
         xlinknames.variable_out = GENERATED_SOURCES
+        xlinknames.clean = ${QMAKE_FILE_OUT} tmp/XLinkNames.h
         QMAKE_EXTRA_COMPILERS += xlinknames
 
         # GENERATOR 5-D:
@@ -1044,6 +1047,7 @@ contains(DEFINES, SVG_SUPPORT=1) {
         xmlnames.dependency_type = TYPE_C
         xmlnames.CONFIG = target_predeps
         xmlnames.variable_out = GENERATED_SOURCES
+        xmlnames.clean = ${QMAKE_FILE_OUT} tmp/XMLNames.h
         QMAKE_EXTRA_COMPILERS += xmlnames
 }
 
@@ -1054,6 +1058,7 @@ idl.variable_out = GENERATED_SOURCES
 idl.input = IDL_BINDINGS
 idl.commands = perl -I$$PWD/bindings/scripts $$PWD/bindings/scripts/generate-bindings.pl --defines \"$${FEATURE_DEFINES_JAVASCRIPT}\" --generator JS --include $$PWD/dom --include $$PWD/html --include $$PWD/xml --include $$PWD/ksvg2/svg --outputdir tmp ${QMAKE_FILE_NAME}
 idl.CONFIG += target_predeps
+idl.clean = tmp/JS${QMAKE_FILE_BASE}.h ${QMAKE_FILE_OUT}
 QMAKE_EXTRA_COMPILERS += idl
 
 # GENERATOR 2-A: LUT creator
@@ -1089,6 +1094,7 @@ cssbison.input = CSSBISON
 cssbison.CONFIG = target_predeps
 cssbison.dependency_type = TYPE_C
 cssbison.variable_out = GENERATED_SOURCES
+cssbison.clean = ${QMAKE_FILE_OUT} tmp/${QMAKE_FILE_BASE}.h
 QMAKE_EXTRA_COMPILERS += cssbison
 #PRE_TARGETDEPS += tmp/CSSGrammar.cpp
 
@@ -1099,34 +1105,39 @@ htmlnames.input = HTML_NAMES
 htmlnames.dependency_type = TYPE_C
 htmlnames.CONFIG = target_predeps
 htmlnames.variable_out = GENERATED_SOURCES
+htmlnames.clean = ${QMAKE_FILE_OUT} tmp/HTMLNames.h
 QMAKE_EXTRA_COMPILERS += htmlnames
 
 # GENERATOR 6-A:
 cssprops.output = tmp/CSSPropertyNames.c
 cssprops.input = WALDOCSSPROPS
-cssprops.commands = cp ${QMAKE_FILE_NAME} tmp && cd tmp && sh $$PWD/css/makeprop
+cssprops.commands = cp ${QMAKE_FILE_NAME} tmp && cd tmp && sh $$PWD/css/makeprop && rm ${QMAKE_FILE_BASE}.strip ${QMAKE_FILE_BASE}.in ${QMAKE_FILE_BASE}.gperf
 cssprops.CONFIG = target_predeps no_link
+cssprops.clean = ${QMAKE_FILE_OUT} tmp/CSSPropertyNames.h
 QMAKE_EXTRA_COMPILERS += cssprops
 
 # GENERATOR 6-B:
 cssvalues.output = tmp/CSSValueKeywords.c
 cssvalues.input = WALDOCSSVALUES
-cssvalues.commands = cp ${QMAKE_FILE_NAME} tmp && cd tmp && sh $$PWD/css/makevalues
+cssvalues.commands = cp ${QMAKE_FILE_NAME} tmp && cd tmp && sh $$PWD/css/makevalues && rm CSSValueKeywords.in CSSValueKeywords.strip CSSValueKeywords.gperf
 cssvalues.CONFIG = target_predeps no_link
+cssvalues.clean = ${QMAKE_FILE_OUT} tmp/CSSValueKeywords.h
 QMAKE_EXTRA_COMPILERS += cssvalues
 
 # GENERATOR 7-A:
 svgcssproperties.output = tmp/ksvgcssproperties.h
 svgcssproperties.input = SVGCSSPROPERTIES
-svgcssproperties.commands = cp $$PWD/ksvg2/css/CSSPropertyNames.in tmp/ksvgcssproperties.in && cd tmp && perl $$PWD/ksvg2/scripts/cssmakeprops -n SVG -f ksvgcssproperties.in
+svgcssproperties.commands = cp $$PWD/ksvg2/css/CSSPropertyNames.in tmp/ksvgcssproperties.in && cd tmp && perl $$PWD/ksvg2/scripts/cssmakeprops -n SVG -f ksvgcssproperties.in && rm ksvgcssproperties.in ksvgcssproperties.gperf
 svgcssproperties.CONFIG = target_predeps no_link
+svgcssproperties.clean = ${QMAKE_FILE_OUT} tmp/ksvgcssproperties.c
 QMAKE_EXTRA_COMPILERS += svgcssproperties
 
 # GENERATOR 7-B:
 svgcssvalues.output = tmp/ksvgcssvalues.h
 svgcssvalues.input = SVGCSSVALUES
-svgcssvalues.commands = perl -ne \'print lc\' $$PWD/ksvg2/css/CSSValueKeywords.in > tmp/ksvgcssvalues.in && cd tmp && perl $$PWD/ksvg2/scripts/cssmakevalues -n SVG -f ksvgcssvalues.in
+svgcssvalues.commands = perl -ne \'print lc\' $$PWD/ksvg2/css/CSSValueKeywords.in > tmp/ksvgcssvalues.in && cd tmp && perl $$PWD/ksvg2/scripts/cssmakevalues -n SVG -f ksvgcssvalues.in && rm ksvgcssvalues.in ksvgcssvalues.gperf
 svgcssvalues.CONFIG = target_predeps no_link
+svgcssvalues.clean = ${QMAKE_FILE_OUT} tmp/ksvgcssvalues.c tmp/CSSValueKeywords.h
 QMAKE_EXTRA_COMPILERS += svgcssvalues
 
 # GENERATOR 8-A:
@@ -1135,6 +1146,7 @@ entities.commands = gperf -a -L ANSI-C -C -G -c -o -t -k '\*' -N findEntity -D -
 entities.input = ENTITIES_GPERF
 entities.dependency_type = TYPE_C
 entities.CONFIG = target_predeps no_link
+entities.clean = ${QMAKE_FILE_OUT}
 QMAKE_EXTRA_COMPILERS += entities
 
 # PRE-GENERATOR 8-B:
@@ -1142,6 +1154,7 @@ doctypestrings.target = $$OUTPUT_DIR/WebCore/tmp/DocTypeStrings.cpp
 doctypestrings.commands = echo \"$${LITERAL_HASH}include <string.h>\" > $$doctypestrings.target && gperf -CEot -L ANSI-C -k \'*\' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards < $$PWD/html/DocTypeStrings.gperf >> $$doctypestrings.target
 QMAKE_EXTRA_TARGETS += doctypestrings
 PRE_TARGETDEPS += $$OUTPUT_DIR/WebCore/tmp/DocTypeStrings.cpp
+CLEAN_FILES += $$doctypestrings.target
 
 # GENERATOR 8-C:
 colordata.output = tmp/ColorData.c
@@ -1156,6 +1169,7 @@ stylesheets.commands = perl $$PWD/css/make-css-file-arrays.pl tmp/UserAgentStyle
 stylesheets.input = STYLESHEETS_EMBED
 stylesheets.CONFIG = target_predeps
 stylesheets.variable_out = GENERATED_SOURCES
+stylesheets.clean = ${QMAKE_FILE_OUT} tmp/UserAgentStyleSheets.h
 QMAKE_EXTRA_COMPILERS += stylesheets
 
 # GENERATOR M
@@ -1173,6 +1187,7 @@ xpathbison.input = XPATHBISON
 xpathbison.CONFIG = target_predeps
 xpathbison.dependency_type = TYPE_C
 xpathbison.variable_out = GENERATED_SOURCES
+xpathbison.clean = ${QMAKE_FILE_OUT} tmp/${QMAKE_FILE_BASE}.h
 QMAKE_EXTRA_COMPILERS += xpathbison