[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 12874f2aea63f3a56b384ad6c279c944087fc669
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 2 09:06:48 2011 +0000

    WebKit/gtk:
    
    2011-01-02  Xan Lopez  <xlopez at igalia.com>
    
            Fix GTK+ build.
    
            * GNUmakefile.am: remove individual -I$(srcdir)/Source when we'll
            already get them from javascriptcore_cppflags, and add it for the
            introspection build (which is not tested in the bots).
    
    JavaScriptCore:
    
    2011-01-02  Xan Lopez  <xlopez at igalia.com>
    
            Fix GTK+ build.
    
            * GNUmakefile.am: add -I$(srcdir)/Source to the JSC cppflags so
            that anyone can include its headers without adding the prefix
            'Source/'.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74865 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 35f7bc5..318677e 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-02  Xan Lopez  <xlopez at igalia.com>
+
+        Fix GTK+ build.
+
+        * GNUmakefile.am: add -I$(srcdir)/Source to the JSC cppflags so
+        that anyone can include its headers without adding the prefix
+        'Source/'.
+
 2011-01-02  Carl Lobo  <carllobo at gmail.com>
 
         Reviewed by Adam Barth.
diff --git a/Source/JavaScriptCore/GNUmakefile.am b/Source/JavaScriptCore/GNUmakefile.am
index b668b26..d73b016 100644
--- a/Source/JavaScriptCore/GNUmakefile.am
+++ b/Source/JavaScriptCore/GNUmakefile.am
@@ -1,4 +1,5 @@
 javascriptcore_cppflags += \
+	-I$(srcdir)/Source \
 	-I$(srcdir)/Source/JavaScriptCore \
 	-I$(srcdir)/Source/JavaScriptCore/API \
 	-I$(srcdir)/Source/JavaScriptCore/assembler \
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index e6b249e..4b6ab17 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-02  Xan Lopez  <xlopez at igalia.com>
+
+        Fix GTK+ build.
+
+        * GNUmakefile.am: remove individual -I$(srcdir)/Source when we'll
+        already get them from javascriptcore_cppflags, and add it for the
+        introspection build (which is not tested in the bots).
+
 2011-01-02  Adam Barth  <abarth at webkit.org>
 
         Speculative build fix for GTK.  Add Source to the include paths.
diff --git a/WebKit/gtk/GNUmakefile.am b/WebKit/gtk/GNUmakefile.am
index 9cb29de..c981389 100644
--- a/WebKit/gtk/GNUmakefile.am
+++ b/WebKit/gtk/GNUmakefile.am
@@ -41,7 +41,6 @@ libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_CPPF
 	-DBUILDING_WEBKIT \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
 	-DDATA_DIR=\"${datadir}\" \
-	-I$(srcdir)/Source \
 	-I$(WebCore)/bindings \
 	-I$(WebCore)/bindings/gobject \
 	-I$(WebKit) \
@@ -265,6 +264,7 @@ $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk- at WEBKITG
 	     --output=$@ \
 	     --add-include-path=$(WebKit) \
 	     --add-include-path=$(top_builddir) \
+	     -I$(srcdir)/Source \
 	     -I$(top_srcdir)/WebCore/platform/network/soup/cache \
 	     -I$(WebKit) \
 	     -I$(GENSOURCES) \
@@ -382,7 +382,6 @@ dist_resources_DATA = \
 noinst_PROGRAMS += $(TEST_PROGS)
 webkit_tests_cflags = \
 	-fno-strict-aliasing \
-	-I$(srcdir)/Source \
 	-I$(srcdir)/Source/JavaScriptCore/ForwardingHeaders \
 	-I$(WebCore)/platform/network/soup/cache \
 	-I$(WebKit) \

-- 
WebKit Debian packaging