Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include <package/> tag in generated GIR

Browse Source 
Specify pkg-config name when generating GIR files, used for mapping GIR
name to pkg-config names

https://bugzilla.gnome.org/show_bug.cgi?id=635287
This commit is contained in:
Ken VanDine
2011-10-18 15:19:16 -04:00
committed by Rico Tzschichholz
parent 674d0eb7e9
commit 5fb443d236
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/Makefile.am
View File

@@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.decl
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = \
--warn-all \
--add-include-path=../gdk
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(srcdir) \
@@ -199,10 +200,11 @@ introspection_files = \
gdkenumtypes.h
Gdk-2.0.gir: $(gdktargetlib) Makefile
Gdk_2_0_gir_SCANNERFLAGS = --warn-all
Gdk_2_0_gir_SCANNERFLAGS = --c-include="gdk/gdk.h"
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)
Gdk_2_0_gir_EXPORT_PACKAGES = gdk-2.0
Gdk_2_0_gir_CFLAGS = $(INCLUDES)
INTROSPECTION_GIRS += Gdk-2.0.gir
@@ -240,10 +242,12 @@ x11_introspection_files = \
x11/gdkx.h
GdkX11-2.0.gir: $(gdktargetlib) Gdk-2.0.gir Makefile
GdkX11_2_0_gir_SCANNERFLAGS = --warn-all --strip-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_SCANNERFLAGS = --identifier-prefix=Gdk --include-uninstalled=Gdk-2.0.gir
GdkX11_2_0_gir_INCLUDES = Gio-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)
GdkX11_2_0_gir_EXPORT_PACKAGES = gdk-x11-2.0
GdkX11_2_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
INTROSPECTION_GIRS += GdkX11-2.0.gir

6
gtk/Makefile.am
View File

@@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.decl
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = \
--warn-all \
--add-include-path=../gdk
INTROSPECTION_COMPILER_ARGS = \
--includedir=$(srcdir) \
@@ -996,11 +997,11 @@ introspection_files = \
gtktypebuiltins.c
Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-2.0.gir Makefile
Gtk_2_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk
Gtk_2_0_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/gdk/Gdk-2.0.gir
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_INCLUDES = Atk-1.0
Gtk_2_0_gir_CFLAGS = \
$(INCLUDES) \
-UGDK_DISABLE_DEPRECATED \
@@ -1008,6 +1009,7 @@ Gtk_2_0_gir_CFLAGS = \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
Gtk_2_0_gir_LIBS = $(gtktargetlib)
Gtk_2_0_gir_FILES = $(introspection_files)
Gtk_2_0_gir_EXPORT_PACKAGES = gtk+-2.0
INTROSPECTION_GIRS += Gtk-2.0.gir
girdir = $(datadir)/gir-1.0