mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-13 22:10:08 +00:00
introspection: Update to new scanner API
* Add --warn-all * Drop unnecessary of --strip-prefix; for GdkX11, use --symbol-prefix https://bugzilla.gnome.org/show_bug.cgi?id=628160 Conflicts: configure.in gdk/Makefile.am gtk/Makefile.am
This commit is contained in:
parent
373f2b8a0c
commit
8e75ddeac6
@ -1565,7 +1565,7 @@ fi
|
||||
# GObject introspection
|
||||
##################################################
|
||||
|
||||
GOBJECT_INTROSPECTION_CHECK([0.6.7])
|
||||
GOBJECT_INTROSPECTION_CHECK([0.9.5])
|
||||
|
||||
##################################################
|
||||
# Checks for gtk-doc and docbook-tools
|
||||
|
@ -196,7 +196,7 @@ introspection_files = \
|
||||
gdkenumtypes.h
|
||||
|
||||
Gdk-2.0.gir: $(gdktargetlib) Makefile
|
||||
Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
|
||||
Gdk_2_0_gir_SCANNERFLAGS = --warn-all
|
||||
Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
|
||||
Gdk_2_0_gir_LIBS = $(gdktargetlib)
|
||||
Gdk_2_0_gir_FILES = $(introspection_files)
|
||||
@ -237,7 +237,7 @@ x11_introspection_files = \
|
||||
x11/gdkx.h
|
||||
|
||||
GdkX11-2.0.gir: $(gdktargetlib) Gdk-2.0.gir Makefile
|
||||
GdkX11_2_0_gir_SCANNERFLAGS = --strip-prefix=gdk_x11
|
||||
GdkX11_2_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Gdk --symbol-prefix=gdk
|
||||
GdkX11_2_0_gir_INCLUDES = Gio-2.0 Gdk-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
|
||||
GdkX11_2_0_gir_LIBS = $(gdktargetlib)
|
||||
GdkX11_2_0_gir_FILES = $(x11_introspection_files)
|
||||
|
@ -991,7 +991,10 @@ introspection_files = \
|
||||
gtktypebuiltins.c
|
||||
|
||||
Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-2.0.gir Makefile
|
||||
Gtk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gtk
|
||||
Gtk_2_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk
|
||||
if USE_X11
|
||||
Gtk_2_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
|
||||
endif
|
||||
Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0
|
||||
Gtk_2_0_gir_CFLAGS = \
|
||||
$(INCLUDES) \
|
||||
|
Loading…
Reference in New Issue
Block a user