[gtk+] Split gdk x11 funcs to their own typelib
- From: Tomeu Vizoso <tomeuv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Split gdk x11 funcs to their own typelib
- Date: Mon, 7 Jun 2010 12:17:49 +0000 (UTC)
commit 42deb581f936ee847cc54ddd936902934d889e7a
Author: Tomeu Vizoso <tomeu vizoso collabora co uk>
Date: Wed Jun 2 18:17:16 2010 +0200
Split gdk x11 funcs to their own typelib
https://bugzilla.gnome.org/show_bug.cgi?id=617863
gdk/Makefile.am | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 0138aa0..596768c 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -202,18 +202,30 @@ introspection_files = \
$(gdk_public_h_sources) \
$(gdk_c_sources) \
gdkenumtypes.c \
- gdkenumtypes.h \
- x11/*.c \
- x11/gdkx.h
+ gdkenumtypes.h
Gdk-3.0.gir: $(gdktargetlib) Makefile
Gdk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
-Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-3.0 Pango-1.0 xlib-2.0
+Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-3.0 Pango-1.0
Gdk_3_0_gir_LIBS = $(gdktargetlib)
Gdk_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
Gdk_3_0_gir_CFLAGS = $(INCLUDES)
INTROSPECTION_GIRS += Gdk-3.0.gir
+if USE_X11
+x11_introspection_files = \
+ x11/*.c \
+ x11/gdkx.h
+
+GdkX11-3.0.gir: $(gdktargetlib) Makefile
+GdkX11_3_0_gir_SCANNERFLAGS = --strip-prefix=gdk_x11 --add-include-path=../gdk-pixbuf
+GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-3.0 Pango-1.0 xlib-2.0
+GdkX11_3_0_gir_LIBS = $(gdktargetlib)
+GdkX11_3_0_gir_FILES = $(addprefix $(srcdir)/,$(x11_introspection_files))
+GdkX11_3_0_gir_CFLAGS = $(INCLUDES)
+INTROSPECTION_GIRS += GdkX11-3.0.gir
+endif # USE_X11
+
girdir = $(datadir)/gir-1.0
dist_gir_DATA = $(INTROSPECTION_GIRS)
@@ -221,7 +233,8 @@ typelibsdir = $(libdir)/girepository-1.0
typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
-endif
+
+endif # HAVE_INTROSPECTION
if OS_WIN32
install-def-file: gdk.def
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]