2010-09-21 Xan Lopez <xlopez@igalia.com>

        Reviewed by Martin Robinson.

        [GTK] Generate correct WebKit gir file with g-i 0.9.5
        https://bugs.webkit.org/show_bug.cgi?id=46173

        Generate a correct gir file for WebKit with the
        gobject-introspection 0.9.5 scanner.

        * GNUmakefile.am:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@67955 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 8f9071b8795afdcad676551d82fc0bb116366d0c..8db9c7341626b3c30ac16fb24bbf69a81f59d6ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-21  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Generate correct WebKit gir file with g-i 0.9.5
+        https://bugs.webkit.org/show_bug.cgi?id=46173
+
+        Generate a correct gir file for WebKit with the
+        gobject-introspection 0.9.5 scanner.
+
+        * GNUmakefile.am:
+
 2010-09-21  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Gustavo Noronha.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 747125d49ea9ca9af1eee25a1096023aebfde57f..03cad1a336dc4caf4890d03c53132a84a6e5a15a 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -397,19 +397,23 @@ JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir
 WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
 
 $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
-       $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=@WEBKITGTK_API_VERSION@ \
+       $(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
+            --symbol-prefix=webkit \
+            --identifier-prefix=WebKit \
+            --namespace=WebKit \
+            --nsversion=@WEBKITGTK_API_VERSION@ \
             --include=GObject-2.0 \
             --include=Gtk-@GTK_API_VERSION@ \
             --include=JSCore-@WEBKITGTK_API_VERSION@ \
             --include=Soup-2.4 \
             --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
             --libtool="$(LIBTOOL)" \
-            --pkg gobject-2.0 \
-            --pkg gtk+-@GTK_API_VERSION@ \
-            --pkg libsoup-2.4 \
-            --output $@ \
-            --add-include-path $(top_srcdir)/WebKit/gtk \
-            --add-include-path $(builddir) \
+            --pkg=gobject-2.0 \
+            --pkg=gtk+-@GTK_API_VERSION@ \
+            --pkg=libsoup-2.4 \
+            --output=$@ \
+            --add-include-path=$(top_srcdir)/WebKit/gtk \
+            --add-include-path=$(builddir) \
             -I$(top_srcdir)/WebKit/gtk \
             -I$(top_builddir)/WebKit/gtk \
             -I$(top_builddir)/DerivedSources \