diff options
| -rw-r--r-- | bus/.gitignore | 1 | ||||
| -rw-r--r-- | bus/Makefile.am | 5 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | doc/.gitignore | 1 | ||||
| -rw-r--r-- | doc/Makefile.am | 13 | ||||
| -rw-r--r-- | doc/dbus-cleanup-sockets.1 (renamed from tools/dbus-cleanup-sockets.1) | 0 | ||||
| -rw-r--r-- | doc/dbus-daemon.1.in (renamed from bus/dbus-daemon.1.in) | 0 | ||||
| -rw-r--r-- | doc/dbus-launch.1 (renamed from tools/dbus-launch.1) | 0 | ||||
| -rw-r--r-- | doc/dbus-monitor.1 (renamed from tools/dbus-monitor.1) | 0 | ||||
| -rw-r--r-- | doc/dbus-send.1 (renamed from tools/dbus-send.1) | 0 | ||||
| -rw-r--r-- | doc/dbus-uuidgen.1 (renamed from tools/dbus-uuidgen.1) | 0 | ||||
| -rw-r--r-- | tools/Makefile.am | 3 |
12 files changed, 16 insertions, 9 deletions
diff --git a/bus/.gitignore b/bus/.gitignore index 74352674..bad51b1d 100644 --- a/bus/.gitignore +++ b/bus/.gitignore @@ -19,7 +19,6 @@ messagebus messagebus-config session.conf system.conf -dbus-daemon.1 bus-test-launch-helper bus-test-system dbus.service diff --git a/bus/Makefile.am b/bus/Makefile.am index 5c4fb15b..17c0df8f 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -276,9 +276,6 @@ systemdsystemunit_DATA = \ dbus.socket endif -MAN_IN_FILES=dbus-daemon.1.in -man_MANS = dbus-daemon.1 - #### Extra dist -EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES) $(man_MANS) $(MAN_IN_FILES) +EXTRA_DIST=$(CONFIG_IN_FILES) $(SCRIPT_IN_FILES) diff --git a/configure.in b/configure.in index e0472961..6c1c9c12 100644 --- a/configure.in +++ b/configure.in @@ -1579,7 +1579,6 @@ bus/session.conf bus/messagebus bus/messagebus-config bus/rc.messagebus -bus/dbus-daemon.1 bus/dbus.service bus/dbus.socket Makefile @@ -1589,6 +1588,7 @@ tools/Makefile test/Makefile test/name-test/Makefile doc/Makefile +doc/dbus-daemon.1 dbus-1.pc test/data/valid-config-files/debug-allow-all.conf test/data/valid-config-files/debug-allow-all-sha1.conf diff --git a/doc/.gitignore b/doc/.gitignore index 3430689c..23125734 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -10,3 +10,4 @@ dbus-specification.html dbus-test-plan.html dbus-tutorial.html dbus-faq.html +dbus-daemon.1 diff --git a/doc/Makefile.am b/doc/Makefile.am index d6554e16..445d2fd6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,13 @@ +man_MANS = \ + dbus-cleanup-sockets.1 \ + dbus-daemon.1 \ + dbus-launch.1 \ + dbus-monitor.1 \ + dbus-send.1 \ + dbus-uuidgen.1 + +MAN_IN_FILES = dbus-daemon.1.in + EXTRA_DIST= \ busconfig.dtd \ diagram.png \ @@ -10,7 +20,8 @@ EXTRA_DIST= \ dcop-howto.txt \ file-boilerplate.c \ introspect.xsl \ - system-activation.txt + system-activation.txt \ + $(MAN_IN_FILES) $(man_MANS) HTML_FILES= \ dbus-faq.html \ diff --git a/tools/dbus-cleanup-sockets.1 b/doc/dbus-cleanup-sockets.1 index ca669f49..ca669f49 100644 --- a/tools/dbus-cleanup-sockets.1 +++ b/doc/dbus-cleanup-sockets.1 diff --git a/bus/dbus-daemon.1.in b/doc/dbus-daemon.1.in index a54f8634..a54f8634 100644 --- a/bus/dbus-daemon.1.in +++ b/doc/dbus-daemon.1.in diff --git a/tools/dbus-launch.1 b/doc/dbus-launch.1 index 0ea19495..0ea19495 100644 --- a/tools/dbus-launch.1 +++ b/doc/dbus-launch.1 diff --git a/tools/dbus-monitor.1 b/doc/dbus-monitor.1 index c24c14d9..c24c14d9 100644 --- a/tools/dbus-monitor.1 +++ b/doc/dbus-monitor.1 diff --git a/tools/dbus-send.1 b/doc/dbus-send.1 index 4878c3d9..4878c3d9 100644 --- a/tools/dbus-send.1 +++ b/doc/dbus-send.1 diff --git a/tools/dbus-uuidgen.1 b/doc/dbus-uuidgen.1 index 480fd18f..480fd18f 100644 --- a/tools/dbus-uuidgen.1 +++ b/doc/dbus-uuidgen.1 diff --git a/tools/Makefile.am b/tools/Makefile.am index 271c1508..ce88c85f 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -48,8 +48,7 @@ dbus_uuidgen_LDFLAGS=@R_DYNAMIC_LDFLAG@ dbus_launch_LDADD= $(DBUS_X_LIBS) $(DBUS_CLIENT_LIBS) dbus_launch_LDFLAGS=@R_DYNAMIC_LDFLAG@ -man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 dbus-uuidgen.1 -EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh strtoll.c strtoull.c +EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c CLEANFILES = \ run-with-tmp-session-bus.conf |