From 673c0d5581c6a5bc410acc8fd932327c5ab99011 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Fri, 8 Feb 2013 16:17:04 +0000 Subject: [PATCH] [GTK] Include files from DerivedSources/webkitdom for introspection https://bugs.webkit.org/show_bug.cgi?id=108631 Patch by Tomas Popela on 2013-02-08 Reviewed by Martin Robinson. Include files from DerivedSources/webkitdom for introspection * /Source/WebKit/gtk/GNUmakefile.am: * /Source/WebKit2/GNUmakefile.am: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142285 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 12 ++++++++++++ Source/WebKit/gtk/GNUmakefile.am | 2 ++ Source/WebKit2/GNUmakefile.am | 2 ++ 3 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6755fb769283..b16f6539cc24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2013-02-08 Tomas Popela + + [GTK] Include files from DerivedSources/webkitdom for introspection + https://bugs.webkit.org/show_bug.cgi?id=108631 + + Reviewed by Martin Robinson. + + Include files from DerivedSources/webkitdom for introspection + + * /Source/WebKit/gtk/GNUmakefile.am: + * /Source/WebKit2/GNUmakefile.am: + 2013-02-07 Martin Robinson [GTK] Split configure.ac into reusable portions diff --git a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am index 12ed56d93ba8..f8e873a93eca 100644 --- a/Source/WebKit/gtk/GNUmakefile.am +++ b/Source/WebKit/gtk/GNUmakefile.am @@ -315,12 +315,14 @@ $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITG -I$(srcdir)/Source \ -I$(WebKit) \ -I$(GENSOURCES) \ + -I$(GENSOURCES_WEBKITDOM) \ -I$(GENSOURCES_WEBKIT) \ -I$(top_builddir)/Source/WebKit/gtk \ -I$(top_srcdir)/Source/JavaScriptCore/ForwardingHeaders \ -I$(top_srcdir) \ $(GENSOURCES_WEBKIT)/webkitenumtypes.h \ $(webkitgtk_h_api) \ + $(webkitgtk_gdom_built_h_api) \ $(WebKit)/webkit/*.cpp girdir = $(datadir)/gir-1.0 diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am index 8a0e13573e1c..081128b37676 100644 --- a/Source/WebKit2/GNUmakefile.am +++ b/Source/WebKit2/GNUmakefile.am @@ -238,6 +238,7 @@ WebKit2-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) libwebkit2gtk-@WEBKITGTK_AP -I$(srcdir)/Source \ -I$(WebKit2) \ -I$(GENSOURCES) \ + -I$(GENSOURCES_WEBKITDOM) \ -I$(GENSOURCES_WEBKIT2) \ -I$(top_builddir)/Source/WebKit2/UIProcess/API/gtk \ -I$(top_srcdir)/Source/JavaScriptCore/ForwardingHeaders \ @@ -247,6 +248,7 @@ WebKit2-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) libwebkit2gtk-@WEBKITGTK_AP -DWEBKIT2_COMPILATION \ $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.h \ $(webkit2gtk_h_api) \ + $(webkitgtk_gdom_built_h_api) \ $(WebKit2)/UIProcess/API/gtk/*.cpp gir2dir = $(datadir)/gir-1.0 -- 2.36.0