AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the build

Browse Source 
gtkx.h can no longer be included internally, so skip it when
generating the gir. We include the individual headers anyway.
This commit is contained in:
Matthias Clasen 2014-07-12 01:56:55 -04:00
parent 91133fc14c
commit 9d26ea42ac
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/Makefile.am
View File

@ -1572,7 +1572,7 @@ if HAVE_INTROSPECTION
# introspection. Rather than copy the annotations over from the # introspection. Rather than copy the annotations over from the
# regular files, exclude the quartz ones: # regular files, exclude the quartz ones:
introspection_files = \ 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, \ $(filter-out gtkclipboard-quartz.c gtkdnd-quartz.c, \
$(gtk_base_c_sources)) \ $(gtk_base_c_sources)) \
gtkprintoperation-unix.c \ 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_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
Gtk_3_0_gir_INCLUDES += xlib-2.0 Gtk_3_0_gir_INCLUDES += xlib-2.0
endif endif
Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
Gtk_3_0_gir_CFLAGS = \ Gtk_3_0_gir_CFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API