From 15cc85db295b3d54f85c541b3c82d7b703c851c8 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 29 Aug 2015 13:35:43 +0100 Subject: [PATCH] build: Do not force inclusion of gtk.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC will not do the right thing, and it will just break the build when trying to include gtk.h first. We'll have to live with the warning from the compiler about a missing gtk_init() — though it would be better not to have to init GTK at all to generate the introspection data. This commit unbreaks the build in GNOME Continuous introduced by commit 6838861d26bfec9af53438022bd1f5b60bab3bf4. --- gtk/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 506e17185d..5dcf1a5aa6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1366,7 +1366,7 @@ introspection_files += \ endif include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_SCANNER_ENV = CC="$(CC)" CPPFLAGS="-I$(top_srcdir) -I$(top_builddir) -I. -include gtk.h" +INTROSPECTION_SCANNER_ENV = CC="$(CC)" INTROSPECTION_COMPILER_ARGS = \ --includedir=$(srcdir) \ --includedir=. \