[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
weinig at apple.com
weinig at apple.com
Mon Feb 21 00:38:38 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit a19c5e4451a17c0f360c9588428ea75f406e6f97
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 2 19:00:32 2011 +0000
Fix windows clean build.
../JavaScriptCore:
* DerivedSources.make:
../WebCore:
* DerivedSources.make:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77389 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 0736621..fa32e93 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-02 Sam Weinig <sam at webkit.org>
+
+ Fix windows clean build.
+
+ * DerivedSources.make:
+
2011-02-02 Alejandro G. Castro <alex at igalia.com>
Reviewed by Martin Robinson.
diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make
index 0ae5944..372c75e 100644
--- a/Source/JavaScriptCore/DerivedSources.make
+++ b/Source/JavaScriptCore/DerivedSources.make
@@ -96,4 +96,9 @@ HeaderDetection.h : DerivedSources.make /System/Library/CoreServices/SystemVersi
if [ -f $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders/pthread_machdep.h ]; then echo "#define HAVE_PTHREAD_MACHDEP_H 1" >> $@; else echo >> $@; fi
if [ -f $(SDKROOT)/System/Library/Frameworks/AppKit.framework/PrivateHeaders/NSScrollerImpPair_Private.h ]; then echo "#define USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER 1" >> $@; else echo >> $@; fi
+else
+
+HeaderDetection.h :
+ echo > $@
+
endif
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 9652980..75734c7 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-02 Sam Weinig <sam at webkit.org>
+
+ Fix windows clean build.
+
+ * DerivedSources.make:
+
2011-02-02 Mikhail Naganov <mnaganov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
index 4db28bf..40bbd7f 100644
--- a/Source/WebCore/DerivedSources.make
+++ b/Source/WebCore/DerivedSources.make
@@ -943,4 +943,9 @@ HeaderDetection.h : DerivedSources.make /System/Library/CoreServices/SystemVersi
echo "/* This is a generated file. Do not edit. */" > $@
if [ -f $(SDKROOT)/System/Library/Frameworks/AppKit.framework/PrivateHeaders/NSScrollerImpPair_Private.h ]; then echo "#define USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER 1" >> $@; else echo >> $@; fi
+else
+
+HeaderDetection.h :
+ echo > $@
+
endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list