1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
|
--- src/Makefile.in.orig 2013-12-15 11:10:12.000000000 +0100
+++ src/Makefile.in 2013-12-15 11:07:30.000000000 +0100
@@ -95,10 +95,13 @@
@WITH_PYTHON_TRUE@am__append_11 = vnc.defs vncmodule.defs.c
@WITH_PYTHON_TRUE@am__append_12 = vnc.override
@WITH_PYTHON_FALSE@am__append_13 = vnc.override vncmodule.c
-@HAVE_GTK_2_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@am__append_14 = \
-@HAVE_GTK_2_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncimageframebuffer.h $(srcdir)/vncimageframebuffer.c
+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_14 = \
+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncimageframebuffer.h $(srcdir)/vncimageframebuffer.c
-@WITH_GOBJECT_INTROSPECTION_TRUE@am__append_15 = $(gir_DATA) $(typelibs_DATA)
+@HAVE_INTROSPECTION_TRUE@am__append_15 = GVnc-1.0.gir
+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_16 = GtkVnc-1.0.gir
+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@am__append_17 = GtkVnc-2.0.gir
+@HAVE_INTROSPECTION_TRUE@am__append_18 = $(gir_DATA) $(typelibs_DATA)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/build-aux/mkinstalldirs \
@@ -355,8 +358,6 @@
GNUTLS_LIBS = @GNUTLS_LIBS@
GNUTLS_REQUIRED = @GNUTLS_REQUIRED@
GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_INTROSPECTION_CFLAGS = @GOBJECT_INTROSPECTION_CFLAGS@
-GOBJECT_INTROSPECTION_LIBS = @GOBJECT_INTROSPECTION_LIBS@
GOBJECT_LIBS = @GOBJECT_LIBS@
GOBJECT_REQUIRED = @GOBJECT_REQUIRED@
GREP = @GREP@
@@ -367,8 +368,6 @@
GTK_LIBS = @GTK_LIBS@
GTK_REQUIRED = @GTK_REQUIRED@
GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@
-G_IR_COMPILER = @G_IR_COMPILER@
-G_IR_SCANNER = @G_IR_SCANNER@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -380,6 +379,14 @@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -613,7 +620,7 @@
vncconnectionenums.h vncconnectionenums.c
CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_11) \
- $(am__append_15)
+ $(am__append_18)
@WITH_PYTHON_TRUE@pyexec_LTLIBRARIES = gtkvnc.la
@WITH_PYTHON_TRUE@gtkvnc_la_LIBADD = libgtk-vnc-$(GTK_VNC_API_VERSION).la @PYGTK_LIBS@
@WITH_PYTHON_TRUE@gtkvnc_la_CFLAGS = @GTK_CFLAGS@ @PYTHON_INCLUDES@ \
@@ -624,31 +631,62 @@
@WITH_PYTHON_TRUE@nodist_gtkvnc_la_SOURCES = vncmodule.defs.c
@WITH_PYTHON_TRUE@CODEGENDIR = $(shell pkg-config --variable=codegendir pygtk-2.0)
@WITH_PYTHON_TRUE@DEFSDIR = $(shell pkg-config --variable=defsdir pygtk-2.0)
-@WITH_GOBJECT_INTROSPECTION_TRUE@GVNC_INTROSPECTION_SRCS = \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncpixelformat.h \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncframebuffer.h $(srcdir)/vncframebuffer.c \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncbaseframebuffer.h $(srcdir)/vncbaseframebuffer.c \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c
-
-@WITH_GOBJECT_INTROSPECTION_TRUE@GTK_VNC_INTROSPECTION_SRCS = $(srcdir)/vnccairoframebuffer.h \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.c \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.h \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.c \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.h \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.c \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.h \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.c \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(am__append_14)
-@G_IR_SCANNER_SYMBOL_PREFIX_FALSE@@WITH_GOBJECT_INTROSPECTION_TRUE@PREFIX_ARGS = --strip-prefix=Vnc
-@G_IR_SCANNER_SYMBOL_PREFIX_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@PREFIX_ARGS = --symbol-prefix=vnc --identifier-prefix=Vnc
-@WITH_GOBJECT_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
-@WITH_GOBJECT_INTROSPECTION_TRUE@gir_DATA = GVnc-1.0.gir GtkVnc-$(GTK_VNC_API_VERSION).gir
-@WITH_GOBJECT_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0
-@WITH_GOBJECT_INTROSPECTION_TRUE@typelibs_DATA = GVnc-1.0.typelib GtkVnc-$(GTK_VNC_API_VERSION).typelib
+INTROSPECTION_GIRS = $(am__append_15) $(am__append_16) \
+ $(am__append_17)
+INTROSPECTION_SCANNER_ARGS = --symbol-prefix=vnc \
+ --identifier-prefix=Vnc \
+ --add-include-path=$(top_srcdir) \
+ --add-include-path=$(srcdir) \
+ --add-include-path=$(builddir)
+
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) \
+ --includedir=$(srcdir)
+
+@HAVE_INTROSPECTION_TRUE@GVNC_INTROSPECTION_SRCS = \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncpixelformat.h \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncframebuffer.h $(srcdir)/vncframebuffer.c \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncbaseframebuffer.h $(srcdir)/vncbaseframebuffer.c \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
+@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c
+
+@HAVE_INTROSPECTION_TRUE@GTK_VNC_INTROSPECTION_SRCS = \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.h \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.c \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.h \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.c \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.h \
+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.c \
+@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.h \
+@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.c \
+@HAVE_INTROSPECTION_TRUE@ $(am__append_14)
+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_INCLUDES = GObject-2.0
+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_PACKAGES = gobject-2.0
+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_EXPORT_PACKAGES = gvnc-1.0
+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_LIBS = libgvnc-1.0.la
+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_FILES = $(GVNC_INTROSPECTION_SRCS)
+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS)
+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_SCANNERFLAGS = --c-include="gvnc.h"
+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_INCLUDES = GObject-2.0 GVnc-1.0
+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION)
+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GTK_VNC_API_VERSION)
+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la
+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS)
+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS)
+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h"
+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_INCLUDES = GObject-2.0 GVnc-1.0
+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION)
+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GKT_VNC_API_VERSION)
+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la
+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS)
+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS)
+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h"
+@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
+@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
+@HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0
+@HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1452,50 +1490,12 @@
@WITH_PYTHON_TRUE@ --register $(DEFSDIR)/gtk-types.defs \
@WITH_PYTHON_TRUE@ --override $(srcdir)/vnc.override vnc.defs > $@
-@WITH_GOBJECT_INTROSPECTION_TRUE@GVnc-1.0.gir: libgvnc-1.0.la $(G_IR_SCANNER) Makefile.am
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --namespace GVnc \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --nsversion 1.0 \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GObject-2.0 \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(PREFIX_ARGS) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --library=$(builddir)/libgvnc-1.0.la \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(top_srcdir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(builddir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --c-include="gvnc.h" \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --output $@ \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(top_srcdir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(srcdir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --verbose \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --pkg=gvnc-1.0 \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(GVNC_INTROSPECTION_SRCS)
-
-@WITH_GOBJECT_INTROSPECTION_TRUE@GtkVnc-$(GTK_VNC_API_VERSION).gir: GVnc-1.0.gir libgtk-vnc-$(GTK_VNC_API_VERSION).la $(G_IR_SCANNER) Makefile.am
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --namespace GtkVnc \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --nsversion $(GTK_VNC_API_VERSION) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GObject-2.0 \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include Gtk-$(GTK_API_VERSION) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GVnc-1.0 \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(PREFIX_ARGS) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --library=$(builddir)/libgtk-vnc-$(GTK_VNC_API_VERSION).la \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(top_srcdir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(builddir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --c-include="gtk-vnc.h" \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --output $@ \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(top_srcdir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(srcdir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --verbose \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --pkg=gtk-vnc-$(GTK_VNC_API_VERSION) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(GTK_VNC_INTROSPECTION_SRCS)
-
-@WITH_GOBJECT_INTROSPECTION_TRUE@%.typelib: %.gir
-@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)$(G_IR_COMPILER) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(srcdir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(builddir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(girdir) \
-@WITH_GOBJECT_INTROSPECTION_TRUE@ -o $@ $<
+-include $(INTROSPECTION_MAKEFILE)
+
+@HAVE_INTROSPECTION_TRUE@GVnc-1.0.gir: libgvnc-1.0.la
+
+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc-1.0.gir: libgtk-vnc-$(GTK_VNC_API_VERSION).la
+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc-2.0.gir: libgtk-vnc-2.0.la
-include $(top_srcdir)/git.mk
|
