2009-11-05 Priit Laes <plaes@plaes.org>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Nov 2009 09:51:32 +0000 (09:51 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 5 Nov 2009 09:51:32 +0000 (09:51 +0000)
        Reviewed by Jan Alonzo.

        [Gtk] Build failure with --enable-introspection
        https://bugs.webkit.org/show_bug.cgi?id=31102

        Add search and include paths for JSCore-1.0.gir required by
        gobject-introspection tools.

        * GNUmakefile.am:

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

ChangeLog
GNUmakefile.am

index 16eb433..0392c24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-05  Priit Laes  <plaes@plaes.org>
+
+        Reviewed by Jan Alonzo.
+
+        [Gtk] Build failure with --enable-introspection
+        https://bugs.webkit.org/show_bug.cgi?id=31102
+
+        Add search and include paths for JSCore-1.0.gir required by
+        gobject-introspection tools.
+
+        * GNUmakefile.am:
+
 2009-11-04  Benjamin Otte  <otte@gnome.org>
 
         Reviewed by Gustavo Noronha.
index 0800e83..67667b2 100644 (file)
@@ -429,6 +429,7 @@ $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)
             --pkg gobject-2.0 \
             --pkg gtk+-2.0 \
             --output $@ \
+            --add-include-path $(top_srcdir)/WebKit/gtk \
             -I$(top_srcdir)/WebKit/gtk \
             -I$(top_builddir)/WebKit/gtk \
             -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
@@ -442,7 +443,7 @@ typelibsdir = $(GIRTYPELIBDIR)
 typelibs_DATA = $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(G_IR_COMPILER)
-       $(AM_V_GEN)$(G_IR_COMPILER) $< -o $@
+       $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk $< -o $@
 
 EXTRA_DIST += $(JSCORE_GIRSOURCES)
 CLEANFILES += $(WEBKIT_GIRSOURCES) $(typelibs_DATA)