Hi,
This fails distcheck with:
make[2]: *** No rule to make target 'doc/connman-vpn.8', needed by 'all-am'.
Stop.
Makefile:1570: recipe for target 'all' failed
make[1]: *** [all] Error 2
Makefile:5020: recipe for target 'distcheck' failed
make: *** [distcheck] Error 1
result 2
On Mon, 2015-10-19 at 13:49 +0300, Jaakko Hannikainen wrote:
> ---
> Makefile.am | 6 ++++--
> doc/connman-vpn.8 | 62
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++
> doc/connman.8 | 2 +-
> doc/connmanctl.1 | 2 +-
> 4 files changed, 68 insertions(+), 4 deletions(-)
> create mode 100644 doc/connman-vpn.8
>
> diff --git a/Makefile.am b/Makefile.am
> index 3d0645e..9193231 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -123,6 +123,8 @@ src_connmand_LDADD = gdbus/libgdbus-internal.la
> $(builtin_libadd) \
> src_connmand_LDFLAGS = -Wl,--export-dynamic \
> -Wl,--version-script=$(srcdir)/src/connman.ver
>
> +MANUAL_PAGES += doc/connman.conf.5 doc/connman.8
> +
These pages are not part of this patch...
> if VPN
> vpn_plugin_LTLIBRARIES =
>
> @@ -151,6 +153,8 @@ vpn_connman_vpnd_LDADD = gdbus/libgdbus-internal.la
> $(builtin_vpn_libadd) \
>
> vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \
> -Wl,--version-script=$(srcdir)/vpn/vpn.ver
> +
> +MANUAL_PAGES += doc/connman-vpn.8
> endif
This file is part of this patch, but I prefer having patches for the
manual pages separate from changes to automake.
> BUILT_SOURCES = $(local_headers) src/builtin.h $(service_files)
> scripts/connman
> @@ -385,8 +389,6 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \
> EXTRA_DIST += src/main.conf \
> src/eduroam.config
>
> -MANUAL_PAGES += doc/connman.8 doc/connman.conf.5
> -
> dist_man_MANS = $(MANUAL_PAGES)
>
> pkgconfigdir = $(libdir)/pkgconfig
> diff --git a/doc/connman-vpn.8 b/doc/connman-vpn.8
> new file mode 100644
> index 0000000..889faff
> --- /dev/null
> +++ b/doc/connman-vpn.8
> @@ -0,0 +1,62 @@
> +.\" connman-vpn(8) manual page
> +.\"
> +.\" Copyright (C) 2015 Intel Corporation
> +.\"
> +.TH CONNMAN-VPN "8" "2015-10-15"
> +.SH NAME
> +ConnMan-VPN \- VPN management daemon
> +.SH SYNOPSIS
> +.B connman-vpnd
> +.RB [\| \-\-version \||\| \-\-help \|]
> +.PP
> +.B connman-vpnd
> +.RB [\| \-c
> +.IR file \|]
> +.RB [\| \-d\ [\c
> +.IR file [,...]\|]\|]
> +.RB [\| \-p
> +.IR plugin [,...]\|]
> +.RB [\| \-P
> +.IR plugin [,...]\|]
> +.RB [\| \-n \|]
> +.RB [\| \-r \|]
> +.SH DESCRIPTION
> +The \fIConnMan-VPN\fP provides a daemon for managing vpn connections together
> +with \fBconnmand\fP(8). The Connection Manager is designed to be slim and to
> +use as few resources as possible. The VPN daemon supports
> \fBopenconnect\fP(8),
> +\fBopenvpn\fP(8), \fBvpnc\fP(8) and L2TP/PPTP (\fBxl2tpd.conf\fP(5),
> +\fBpptp\fP(8), \fBpppd\fP(8)).
> +.P
> +.SH OPTIONS
> +The following options are supported:
> +.TP
> +.BR \-v ", " \-\-version
> +Print the ConnMan-VPN software version and exit.
> +.TP
> +.BR \-h ", " \-\-help
> +Print ConnMan-VPN's available options and exit.
> +.TP
> +.BI \-c\ file\fR,\ \fB\-\-config= \fIfile
> +Specify configuration file to set up various settings for ConnMan. If not
> +specified, the default value of \fI<SYSCONFDIR>/connman/connman-vpn.conf\fP
> +is used; where \fI<SYSCONFDIR>\fP is dependent on your distribution (usually
> +it's \fI/etc\fP). See \fBconnman-vpn.conf\fP(5) for more information on
> +configuration file. The use of config file is optional and sane default
> values
> +are used if config file is missing.
> +.TP
> +.BR \-d\ [ \fIfile [,...]],\ \-\-debug [= \fIfile [,...]]
> +Sets how much information ConnMan-VPN sends to the log destination (usually
> +syslog's "daemon" facility). If the file options are omitted, then debugging
> +information from all the source files are printed. If file options are
> +present, then only debug prints from that source file are printed. Example:
> +.PP
> + connman-vpnd --debug=vpn/vpn-provider.c,vpn/vpn-config.c
> +.TP
> +.BR \-n ", " \-\-nodaemon
> +Do not daemonize. This is useful for debugging, and directs log output to
> +the controlling terminal in addition to syslog.
> +.TP
> +.BR \-r ", " \-\-routes
> +Manage VPN routes instead of telling \fBconnmand\fP(8) to do it.
> +.SH SEE ALSO
> +.BR connmanctl (1), \ connmand (8)
> diff --git a/doc/connman.8 b/doc/connman.8
> index 51c77e3..7ae9ff5 100644
> --- a/doc/connman.8
> +++ b/doc/connman.8
> @@ -94,4 +94,4 @@ If this option is used, then ConnMan is not able to cache
> the DNS queries
> because the DNS traffic is not going through ConnMan and that can cause
> some extra network traffic.
> .SH SEE ALSO
> -.BR connmanctl (1), \ connman.conf (5)
> +.BR connmanctl (1), \ connman.conf (5), \ connman-vpn (8)
> diff --git a/doc/connmanctl.1 b/doc/connmanctl.1
> index c3d4803..470fae7 100644
> --- a/doc/connmanctl.1
> +++ b/doc/connmanctl.1
> @@ -272,4 +272,4 @@ Setting multiple proxy servers:
> .PP
> .SH
> SEE ALSO
> -.BR connman.conf (5), \ connman (8)
> +.BR connman.conf (5), \ connman (8), \ connman-vpn (8)
Patrik
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
