[gtk+] build: Do not force inclusion of gtk.h
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] build: Do not force inclusion of gtk.h
- Date: Sat, 29 Aug 2015 12:39:09 +0000 (UTC)
commit 15cc85db295b3d54f85c541b3c82d7b703c851c8
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sat Aug 29 13:35:43 2015 +0100
build: Do not force inclusion of gtk.h
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 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 506e171..5dcf1a5 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=. \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]