a684c02d5e
- remove private libtool copy - patch out invocations of host commands - provide missing macros - disables tests, examples and docs SVN-Revision: 24371
97 lines
3.3 KiB
Diff
97 lines
3.3 KiB
Diff
--- a/dbus/Makefile.in
|
|
+++ b/dbus/Makefile.in
|
|
@@ -315,7 +315,7 @@ target_vendor = @target_vendor@
|
|
top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
-SUBDIRS = . examples
|
|
+SUBDIRS = .
|
|
INCLUDES = \
|
|
-I$(top_srcdir) \
|
|
-I$(top_builddir) \
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -267,8 +267,8 @@ top_build_prefix = @top_build_prefix@
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
GLIB_PC = dbus-glib-1.pc
|
|
-SUBDIRS = dbus tools test doc
|
|
-DIST_SUBDIRS = dbus tools test doc m4
|
|
+SUBDIRS = dbus
|
|
+DIST_SUBDIRS = dbus tools m4
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = $(GLIB_PC)
|
|
DISTCLEANFILES = \
|
|
--- a/tools/Makefile.am
|
|
+++ b/tools/Makefile.am
|
|
@@ -1,24 +1,10 @@
|
|
INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_COMPILATION
|
|
|
|
-nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
|
|
libdbus_glibdir = $(includedir)/dbus-1.0/dbus
|
|
|
|
-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
|
|
-
|
|
-BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
|
|
-
|
|
-if USE_INTROSPECT_XML
|
|
-dbus-bus-introspect.xml: $(INTROSPECT_XML_PATH)
|
|
- cp $(INTROSPECT_XML_PATH) dbus-bus-introspect.xml
|
|
-else
|
|
-dbus-bus-introspect.xml:
|
|
- 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
|
|
-endif
|
|
+BUILT_SOURCES =
|
|
|
|
EXTRA_DIST = run-with-tmp-session-bus.sh session.conf
|
|
|
|
CLEANFILES = \
|
|
- run-with-tmp-session-bus.conf \
|
|
- dbus-bus-introspect.xml \
|
|
- dbus-glib-bindings.h
|
|
+ run-with-tmp-session-bus.conf
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -58,9 +58,6 @@ AC_ARG_ENABLE(bash-completion, AS_HELP_S
|
|
AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check]))
|
|
|
|
|
|
-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]))
|
|
-
|
|
-
|
|
AM_CONDITIONAL(DBUS_BASH_COMPLETION, test x$enable_bash_completion = xyes)
|
|
if test x$enable_bash_completion = xyes; then
|
|
AC_DEFINE(DBUS_BASH_COMPLETION,1,[Enable bash completion])
|
|
@@ -815,18 +812,6 @@ fi
|
|
AC_SUBST(TEST_SOCKET_DIR)
|
|
AC_DEFINE_UNQUOTED(DBUS_TEST_SOCKET_DIR, "$TEST_SOCKET_DIR", [Where to put test sockets])
|
|
|
|
-#### Test if we should generate daemon introspection xml
|
|
-use_introspect_xml=false
|
|
-
|
|
-if ! test -z "$with_introspect_xml" ; then
|
|
- use_introspect_xml=true
|
|
- INTROSPECT_XML_PATH="$with_introspect_xml"
|
|
- AC_DEFINE(INTROSPECT_XML_PATH, "$INTROSPECT_XML_PATH", [Path to pregenerated xml for dbus daemon introspection])
|
|
- AC_SUBST(INTROSPECT_XML_PATH)
|
|
-fi
|
|
-
|
|
-AM_CONDITIONAL(USE_INTROSPECT_XML, $use_introspect_xml)
|
|
-
|
|
AC_OUTPUT([
|
|
Makefile
|
|
m4/Makefile
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -1,7 +1,7 @@
|
|
GLIB_PC=dbus-glib-1.pc
|
|
|
|
-SUBDIRS=dbus tools test doc
|
|
-DIST_SUBDIRS=dbus tools test doc m4
|
|
+SUBDIRS=dbus tools
|
|
+DIST_SUBDIRS=dbus tools m4
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = $(GLIB_PC)
|