3 @@ -315,7 +315,7 @@ target_vendor = @target_vendor@
4 top_build_prefix = @top_build_prefix@
5 top_builddir = @top_builddir@
6 top_srcdir = @top_srcdir@
14 @@ -267,8 +267,8 @@ top_build_prefix = @top_build_prefix@
15 top_builddir = @top_builddir@
16 top_srcdir = @top_srcdir@
17 GLIB_PC = dbus-glib-1.pc
18 -SUBDIRS = dbus tools test doc
19 -DIST_SUBDIRS = dbus tools test doc m4
21 +DIST_SUBDIRS = dbus tools m4
22 pkgconfigdir = $(libdir)/pkgconfig
23 pkgconfig_DATA = $(GLIB_PC)
25 --- a/tools/Makefile.am
26 +++ b/tools/Makefile.am
28 INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_COMPILATION
30 -nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
31 libdbus_glibdir = $(includedir)/dbus-1.0/dbus
33 -dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
34 - $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
36 -BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
38 -if USE_INTROSPECT_XML
39 -dbus-bus-introspect.xml: $(INTROSPECT_XML_PATH)
40 - cp $(INTROSPECT_XML_PATH) dbus-bus-introspect.xml
42 -dbus-bus-introspect.xml:
43 - DBUS_TOP_BUILDDIR=$(top_builddir) @DBUS_DAEMONDIR@dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
47 EXTRA_DIST = run-with-tmp-session-bus.sh session.conf
50 - run-with-tmp-session-bus.conf \
51 - dbus-bus-introspect.xml \
52 - dbus-glib-bindings.h
53 + run-with-tmp-session-bus.conf
56 @@ -58,9 +58,6 @@ AC_ARG_ENABLE(bash-completion, AS_HELP_S
57 AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check]))
60 -AC_ARG_WITH(introspect-xml, AS_HELP_STRING([--with-introspect-xml=[filename]],[Pass in a pregenerated dbus daemon introspection xml file (as generated by 'dbus-daemon --introspect') to use instead of querying the installed dbus daemon]))
63 AM_CONDITIONAL(DBUS_BASH_COMPLETION, test x$enable_bash_completion = xyes)
64 if test x$enable_bash_completion = xyes; then
65 AC_DEFINE(DBUS_BASH_COMPLETION,1,[Enable bash completion])
66 @@ -815,18 +812,6 @@ fi
67 AC_SUBST(TEST_SOCKET_DIR)
68 AC_DEFINE_UNQUOTED(DBUS_TEST_SOCKET_DIR, "$TEST_SOCKET_DIR", [Where to put test sockets])
70 -#### Test if we should generate daemon introspection xml
71 -use_introspect_xml=false
73 -if ! test -z "$with_introspect_xml" ; then
74 - use_introspect_xml=true
75 - INTROSPECT_XML_PATH="$with_introspect_xml"
76 - AC_DEFINE(INTROSPECT_XML_PATH, "$INTROSPECT_XML_PATH", [Path to pregenerated xml for dbus daemon introspection])
77 - AC_SUBST(INTROSPECT_XML_PATH)
80 -AM_CONDITIONAL(USE_INTROSPECT_XML, $use_introspect_xml)
88 GLIB_PC=dbus-glib-1.pc
90 -SUBDIRS=dbus tools test doc
91 -DIST_SUBDIRS=dbus tools test doc m4
93 +DIST_SUBDIRS=dbus tools m4
95 pkgconfigdir = $(libdir)/pkgconfig
96 pkgconfig_DATA = $(GLIB_PC)