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

[xan at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit d62ef70c79a9e6c3efcb5acb594eeaca142620cc
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 23 13:25:20 2009 +0000

    2009-09-23  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            Do not add unneeded include paths for gir files, and add the
            include paths for headers manually instead of relying on our own
            pc file and installed headers, since that adds a circular
            dependency.
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48673 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index f86b570..9065b3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-23  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Do not add unneeded include paths for gir files, and add the
+        include paths for headers manually instead of relying on our own
+        pc file and installed headers, since that adds a circular
+        dependency.
+
+        * GNUmakefile.am:
+
 2009-09-23  Jan Michael Alonzo  <jmalonzo at webkit.org>
 
         Reviewed by Xan Lopez.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 4982340..40c791a 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -417,7 +417,6 @@ WEBKIT_GIRSOURCES = WebKit-1.0.gir
 
 $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
 	$(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=1.0 \
-	    --add-include-path=$(srcdir) --add-include-path=. \
 	     --include=GObject-2.0 \
 	     --include=Gtk-2.0 \
 	     --include=JSCore-1.0 \
@@ -426,8 +425,11 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
 	     --libtool="$(LIBTOOL)" \
 	     --pkg gobject-2.0 \
 	     --pkg gtk+-2.0 \
-	     --pkg webkit-1.0 \
 	     --output $@ \
+	     -I$(top_srcdir)/WebKit/gtk \
+	     -I$(top_builddir)/WebKit/gtk \
+	     -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
+	     -I$(top_srcdir) \
 	     $(webkitgtk_h_api)
 
 girdir = $(GIRDIR)

-- 
WebKit Debian packaging