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
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
|
From 3d401bef5e3ee37e66f4b791112228420a541556 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Sat, 30 May 2009 23:41:14 +0200
Subject: [PATCH 2/2] hand picked autoreconf
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Makefile.in | 1 +
configure | 14 ++++++++++++++
dbus/Makefile.in | 1 +
dbus/examples/Makefile.in | 5 +++--
dbus/examples/statemachine/Makefile.in | 5 +++--
doc/Makefile.in | 1 +
doc/reference/Makefile.in | 1 +
m4/Makefile.in | 1 +
test/Makefile.in | 1 +
test/core/Makefile.in | 7 ++++---
test/interfaces/Makefile.in | 13 +++++++------
tools/Makefile.in | 3 ++-
12 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 1107732..33c2135 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,6 +109,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
diff --git a/configure b/configure
index 568b58c..87d298c 100755
--- a/configure
+++ b/configure
@@ -882,6 +882,7 @@ LN_S
SED
DBUS_BUILD_TESTS_FALSE
DBUS_BUILD_TESTS_TRUE
+DBUS_BINDING_TOOL
DBUS_BASH_COMPLETION_FALSE
DBUS_BASH_COMPLETION_TRUE
EGREP
@@ -1003,6 +1004,7 @@ enable_gcov
enable_bash_completion
with_test_socket_dir
with_introspect_xml
+with_dbus_binding_tool
enable_shared
enable_static
enable_fast_install
@@ -1696,6 +1698,8 @@ Optional Packages:
Pass in a pregenerated dbus daemon introspection xml
file (as generated by 'dbus-daemon --introspect') to
use instead of querying the installed dbus daemon
+ --with-dbus-binding-tool=filename
+ Use external dbus-binding-tool program
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
both]
@@ -5174,6 +5178,16 @@ _ACEOF
fi
+# Check whether --with-dbus-binding-tool was given.
+if test "${with_dbus_binding_tool+set}" = set; then
+ withval=$with_dbus_binding_tool; DBUS_BINDING_TOOL=$withval
+else
+ DBUS_BINDING_TOOL=\$\(top_builddir\)/dbus/dbus-binding-tool
+fi
+
+
+
+
if test x$enable_tests = xyes; then
DBUS_BUILD_TESTS_TRUE=
DBUS_BUILD_TESTS_FALSE='#'
diff --git a/dbus/Makefile.in b/dbus/Makefile.in
index bec075b..3d04f2c 100644
--- a/dbus/Makefile.in
+++ b/dbus/Makefile.in
@@ -158,6 +158,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
diff --git a/dbus/examples/Makefile.in b/dbus/examples/Makefile.in
index 9d46086..8ff46e1 100644
--- a/dbus/examples/Makefile.in
+++ b/dbus/examples/Makefile.in
@@ -114,6 +114,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -668,10 +669,10 @@ uninstall-am:
example-service-glue.h: example-service.xml
- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml
example-signal-emitter-glue.h: example-signal-emitter.xml
- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/dbus/examples/statemachine/Makefile.in b/dbus/examples/statemachine/Makefile.in
index e3fd4c5..b6410f0 100644
--- a/dbus/examples/statemachine/Makefile.in
+++ b/dbus/examples/statemachine/Makefile.in
@@ -87,6 +87,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -529,10 +530,10 @@ uninstall-am:
statemachine-server-glue.h: statemachine-server.xml
- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $<
+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_server --mode=glib-server --output=$@ $<
statemachine-glue.h: statemachine.xml
- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $<
+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_object --mode=glib-server --output=$@ $<
sm-marshal.c: Makefile sm-marshal.list
@GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d16449b..4a86edd 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -77,6 +77,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
diff --git a/doc/reference/Makefile.in b/doc/reference/Makefile.in
index 1023582..6fd65e6 100644
--- a/doc/reference/Makefile.in
+++ b/doc/reference/Makefile.in
@@ -72,6 +72,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
diff --git a/m4/Makefile.in b/m4/Makefile.in
index d5bdb02..cd677fc 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -65,6 +65,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
diff --git a/test/Makefile.in b/test/Makefile.in
index 7a2e95b..87a0e08 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -100,6 +100,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
diff --git a/test/core/Makefile.in b/test/core/Makefile.in
index b2058b1..bfe1f47 100644
--- a/test/core/Makefile.in
+++ b/test/core/Makefile.in
@@ -175,6 +175,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -767,13 +768,13 @@ uninstall-am:
@DBUS_BUILD_TESTS_TRUE@test-service-glib-glue.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool
-@DBUS_BUILD_TESTS_TRUE@ $(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml
+@DBUS_BUILD_TESTS_TRUE@ $(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml
@DBUS_BUILD_TESTS_TRUE@test-service-glib-subclass-glue.h: test-service-glib-subclass.xml $(top_builddir)/dbus/dbus-binding-tool
-@DBUS_BUILD_TESTS_TRUE@ $(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object_subclass --mode=glib-server --output=test-service-glib-subclass-glue.h $(srcdir)/test-service-glib-subclass.xml
+@DBUS_BUILD_TESTS_TRUE@ $(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object_subclass --mode=glib-server --output=test-service-glib-subclass-glue.h $(srcdir)/test-service-glib-subclass.xml
@DBUS_BUILD_TESTS_TRUE@test-service-glib-bindings.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool
-@DBUS_BUILD_TESTS_TRUE@ $(DEBUG) $(top_builddir)/dbus/dbus-binding-tool --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
+@DBUS_BUILD_TESTS_TRUE@ $(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
@DBUS_BUILD_TESTS_TRUE@my-object-marshal.c: Makefile my-object-marshal.list
@DBUS_BUILD_TESTS_TRUE@ @GLIB_GENMARSHAL@ --prefix=my_object_marshal $(srcdir)/my-object-marshal.list --header --body > my-object-marshal.c
diff --git a/test/interfaces/Makefile.in b/test/interfaces/Makefile.in
index f0a918a..84bf211 100644
--- a/test/interfaces/Makefile.in
+++ b/test/interfaces/Makefile.in
@@ -104,6 +104,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -637,22 +638,22 @@ uninstall-am:
@DBUS_BUILD_TESTS_TRUE@test-song-glue.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool
-@DBUS_BUILD_TESTS_TRUE@ $(top_builddir)/dbus/dbus-binding-tool --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml
+@DBUS_BUILD_TESTS_TRUE@ $(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml
@DBUS_BUILD_TESTS_TRUE@test-song-bindings.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool
-@DBUS_BUILD_TESTS_TRUE@ $(top_builddir)/dbus/dbus-binding-tool --prefix=test_song --mode=glib-client --output=test-song-bindings.h $(srcdir)/test-song.xml
+@DBUS_BUILD_TESTS_TRUE@ $(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-client --output=test-song-bindings.h $(srcdir)/test-song.xml
@DBUS_BUILD_TESTS_TRUE@test-hello-glue.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool
-@DBUS_BUILD_TESTS_TRUE@ $(top_builddir)/dbus/dbus-binding-tool --prefix=test_hello --mode=glib-server --output=test-hello-glue.h $(srcdir)/test-hello.xml
+@DBUS_BUILD_TESTS_TRUE@ $(DBUS_BINDING_TOOL) --prefix=test_hello --mode=glib-server --output=test-hello-glue.h $(srcdir)/test-hello.xml
@DBUS_BUILD_TESTS_TRUE@test-hello-bindings.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool
-@DBUS_BUILD_TESTS_TRUE@ $(top_builddir)/dbus/dbus-binding-tool --prefix=test_hello --mode=glib-client --output=test-hello-bindings.h $(srcdir)/test-hello.xml
+@DBUS_BUILD_TESTS_TRUE@ $(DBUS_BINDING_TOOL) --prefix=test_hello --mode=glib-client --output=test-hello-bindings.h $(srcdir)/test-hello.xml
@DBUS_BUILD_TESTS_TRUE@test-goodbye-glue.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool
-@DBUS_BUILD_TESTS_TRUE@ $(top_builddir)/dbus/dbus-binding-tool --prefix=test_goodbye --mode=glib-server --output=test-goodbye-glue.h $(srcdir)/test-goodbye.xml
+@DBUS_BUILD_TESTS_TRUE@ $(DBUS_BINDING_TOOL) --prefix=test_goodbye --mode=glib-server --output=test-goodbye-glue.h $(srcdir)/test-goodbye.xml
@DBUS_BUILD_TESTS_TRUE@test-goodbye-bindings.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool
-@DBUS_BUILD_TESTS_TRUE@ $(top_builddir)/dbus/dbus-binding-tool --prefix=test_goodbye --mode=glib-client --output=test-goodbye-bindings.h $(srcdir)/test-goodbye.xml
+@DBUS_BUILD_TESTS_TRUE@ $(DBUS_BINDING_TOOL) --prefix=test_goodbye --mode=glib-client --output=test-goodbye-bindings.h $(srcdir)/test-goodbye.xml
### not building tests
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 7adaa9a..de90a02 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -77,6 +77,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_BUS_CFLAGS = @DBUS_BUS_CFLAGS@
DBUS_BUS_LIBS = @DBUS_BUS_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -481,7 +482,7 @@ uninstall-am: uninstall-nodist_libdbus_glibHEADERS
dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
+ $(DBUS_BINDING_TOOL) --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
@USE_INTROSPECT_XML_TRUE@dbus-bus-introspect.xml: $(INTROSPECT_XML_PATH)
@USE_INTROSPECT_XML_TRUE@ cp $(INTROSPECT_XML_PATH) dbus-bus-introspect.xml
--
1.6.3.1
|
