[gtk+] Fix the build



commit 9d26ea42acd3d7a0b023c2093bb0229efb5ee222
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jul 12 01:56:55 2014 -0400

    Fix the build
    
    gtkx.h can no longer be included internally, so skip it when
    generating the gir. We include the individual headers anyway.

 gtk/Makefile.am |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 531b315..e821185 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1572,7 +1572,7 @@ if HAVE_INTROSPECTION
 # introspection. Rather than copy the annotations over from the
 # regular files, exclude the quartz ones:
 introspection_files = \
-    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) $(a11yinclude_HEADERS) 
$(deprecatedinclude_HEADERS)) \
+    $(filter-out %private.h gtktextdisplay.h gtktextlayout.h gtkx.h, $(gtkinclude_HEADERS) 
$(a11yinclude_HEADERS) $(deprecatedinclude_HEADERS)) \
     $(filter-out  gtkclipboard-quartz.c gtkdnd-quartz.c, \
     $(gtk_base_c_sources)) \
     gtkprintoperation-unix.c \
@@ -1601,7 +1601,6 @@ if USE_X11
 Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
 Gtk_3_0_gir_INCLUDES += xlib-2.0
 endif
-Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
 Gtk_3_0_gir_CFLAGS = \
                $(AM_CPPFLAGS) \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]