[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
mrobinson at webkit.org
mrobinson at webkit.org
Sun Feb 20 23:05:04 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 678cba23eb2aece488bf840cef921a17351b55a0
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 17 05:59:09 2011 +0000
2011-01-16 Martin Robinson <mrobinson at igalia.com>
Build fix for GTK+ after source directory movement.
* GNUmakefile.am: Correct include paths.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75911 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index edf06b7..c92ee1d 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-16 Martin Robinson <mrobinson at igalia.com>
+
+ Build fix for GTK+ after source directory movement.
+
+ * GNUmakefile.am: Correct include paths.
+
2011-01-16 Adam Barth <abarth at webkit.org>
Teach svn-apply about WebKit move.
diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am
index ebbafac..3db766f 100644
--- a/Tools/GNUmakefile.am
+++ b/Tools/GNUmakefile.am
@@ -5,9 +5,9 @@ noinst_PROGRAMS += \
# GtkLauncher
Programs_GtkLauncher_CPPFLAGS = \
- -I$(srcdir)/WebKit/gtk \
+ -I$(srcdir)/Source/WebKit/gtk \
-I$(srcdir)/Source/WebCore/platform/network/soup/cache/ \
- -I$(top_builddir)/WebKit/gtk \
+ -I$(top_builddir)/Source/WebKit/gtk \
-I$(top_builddir)/DerivedSources \
$(global_cppflags) \
$(javascriptcore_cppflags)
@@ -37,10 +37,10 @@ dumprendertree_cppflags := \
-I$(srcdir)/Tools/DumpRenderTree \
-I$(srcdir)/Tools/DumpRenderTree/cairo \
-I$(srcdir)/Tools/DumpRenderTree/gtk \
- -I$(srcdir)/WebKit/gtk \
+ -I$(srcdir)/Source/WebKit/gtk \
-I$(srcdir)/Source/WebCore/platform/gtk \
-I$(srcdir)/Source/WebCore/platform/network/soup/cache/ \
- -I$(top_builddir)/WebKit/gtk \
+ -I$(top_builddir)/Source/WebKit/gtk \
-I$(top_builddir)/DerivedSources \
$(global_cppflags) \
$(javascriptcore_cppflags)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list