[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 9a75f5f0edf3b57a290a42ccbaeb8abdb4924bd7
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 9 08:59:11 2009 +0000

    Attempt to fix the GTK release build.
    
    * GNUmakefile.am: Include Grammar.cpp in release builds now that
    AllInOneFile.cpp is gone.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49384 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ff67b0e..3649704 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-09  Mark Rowe  <mrowe at apple.com>
+
+        Attempt to fix the GTK release build.
+
+        * GNUmakefile.am: Include Grammar.cpp in release builds now that
+        AllInOneFile.cpp is gone.
+
 2009-10-09  Gabor Loki  <loki at inf.u-szeged.hu>
 
         Rubber-stamped by Eric Seidel.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 0d7f68c..eff9274 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -505,19 +505,10 @@ javascriptcore_sources += \
 	JavaScriptCore/wtf/dtoa.cpp \
 	JavaScriptCore/wtf/dtoa.h
 
-# Debug build
-if ENABLE_DEBUG
 javascriptcore_built_sources += \
 	DerivedSources/Grammar.cpp \
 	DerivedSources/Grammar.h
 
-else
-javascriptcore_built_nosources += \
-	DerivedSources/Grammar.cpp \
-	DerivedSources/Grammar.h
-
-endif # END ENABLE_DEBUG
-
 DerivedSources/Grammar.h: DerivedSources/Grammar.cpp;
 
 DerivedSources/Grammar.cpp: $(srcdir)/JavaScriptCore/parser/Grammar.y

-- 
WebKit Debian packaging