2007-06-01 George Staikos <staikos@kde.org>

        Reviewed by bdash.

        Redo the build fix again after it was backed out

        * WebCore.pro: add an include guard around CSSGrammar.h

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f8f70345d93cd2351fb18b14a5cb5148d7d44b94..cb9735a2f71a6415567056a53fcab517ccac4eff 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-01  George Staikos  <staikos@kde.org>
+
+        Reviewed by bdash.
+
+        Redo the build fix again after it was backed out
+
+        * WebCore.pro: add an include guard around CSSGrammar.h
+
 2007-05-31  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Beth Dakin.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 0eea0db8e32a8950cb841550c6bd24deed017f90..a444c48b598d3f95eb1e571b967d5e444175597a 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1288,8 +1288,10 @@ tokenizer.CONFIG += target_predeps no_link
 QMAKE_EXTRA_COMPILERS += tokenizer
 
 # GENERATOR 4: CSS grammar
+CSS_GRAMMAR_GUARD_A = \"\\043ifndef CSSGRAMMAR_H\\n\\043define CSSGRAMMAR_H\\n\"
+CSS_GRAMMAR_GUARD_B = \"\\043endif\\n\"
 cssbison.output = tmp/${QMAKE_FILE_BASE}.cpp
-cssbison.commands = bison -d -p cssyy ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_BASE}.tab.c && mv ${QMAKE_FILE_BASE}.tab.c tmp/${QMAKE_FILE_BASE}.cpp && mv ${QMAKE_FILE_BASE}.tab.h tmp/${QMAKE_FILE_BASE}.h
+cssbison.commands = bison -d -p cssyy ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_BASE}.tab.c && mv ${QMAKE_FILE_BASE}.tab.c tmp/${QMAKE_FILE_BASE}.cpp && touch tmp/${QMAKE_FILE_BASE}.h && perl -e \'printf $$CSS_GRAMMAR_GUARD_A\' > tmp/${QMAKE_FILE_BASE}.h && cat ${QMAKE_FILE_BASE}.tab.h >> tmp/${QMAKE_FILE_BASE}.h && perl -e \'printf $$CSS_GRAMMAR_GUARD_B\' >> tmp/${QMAKE_FILE_BASE}.h && rm ${QMAKE_FILE_BASE}.tab.h
 cssbison.depend = ${QMAKE_FILE_NAME}
 cssbison.input = CSSBISON
 cssbison.CONFIG = target_predeps