diff options
| author | Colin Walters <walters@verbum.org> | 2005-03-17 17:48:29 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-03-17 17:48:29 +0000 |
| commit | a65587676f6791ff6a7c9ed98bbc53d740f51fa8 (patch) | |
| tree | 1e5fb5030cf55dc63dc388e6da4a7918dfa9251f /glib | |
| parent | 6180ae6941aea083f5b8f3c4d3f16c928935bcaf (diff) | |
2005-03-17 Colin Walters <walters@verbum.org>
* bus/print-introspect.c: Move to tools/.
* bus/run-with-tmp-session-bus.sh: Ditto.
* glib/Makefile.am (dbus-glib-bindings.h): Move
generation to tools/Makefile.am.
* test/glib/run-test.sh: Update to handle move
of run-with-tmp-session-bus.sh.
* test/glib/test-service-glib.c: Update to handle
move of dbus-glib-bindings.h.
* tools/print-introspect.c: Moved here
from bus/, and ported to GLib bindings.
* tools/run-with-tmp-session-bus.sh: Moved here
from bus/.
* tools/Makefile.am: Generate dbus-glib-bindings.h
and dbus-bus-introspect.xml here.
* tools/.cvsignore, glib/.cvsignore, bus/.cvsignore:
Update.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/.cvsignore | 1 | ||||
| -rw-r--r-- | glib/Makefile.am | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/glib/.cvsignore b/glib/.cvsignore index e1a6372c..4e197a9f 100644 --- a/glib/.cvsignore +++ b/glib/.cvsignore @@ -6,7 +6,6 @@ Makefile.in *.la dbus-glib-test dbus-binding-tool -dbus-glib-bindings.h *.bb *.bbg *.da diff --git a/glib/Makefile.am b/glib/Makefile.am index b4256fac..6d81e7d1 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -2,9 +2,6 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_T lib_LTLIBRARIES=libdbus-glib-1.la -libdbus_glib_HEADERS = dbus-glib-bindings.h -libdbus_glibdir = $(includedir)/dbus-1.0/dbus - libdbus_glib_1_la_SOURCES = \ dbus-glib.c \ dbus-gmain.c \ @@ -50,11 +47,6 @@ dbus_binding_tool_SOURCES = \ dbus_binding_tool_LDADD= -lexpat libdbus-gtool.la -dbus-glib-bindings.h: $(top_builddir)/bus/dbus-bus-introspect.xml dbus-binding-tool - ./dbus-binding-tool --ignore-unsupported --mode=glib-client --output=dbus-glib-bindings.h $(top_builddir)/bus/dbus-bus-introspect.xml # FIXME - remove --ignore-unsupported when we can do arrays - -BUILT_SOURCES = dbus-glib-bindings.h - ## we just rebuilt these manually and check them into cvs; easier than ## convincing automake/make to do this properly regenerate-built-sources: |