From 4ffa25b8805eb4454cf613a0e36cf08d2379941e Mon Sep 17 00:00:00 2001 From: Sam Varshavchik Date: Sat, 8 Apr 2017 12:10:32 -0400 Subject: [PATCH 1/2] Fix creation of documentation from libnutclient_misc.txt A simple .txt.3 rule doesn't understand that libnutclient_misc.txt creates a bunch of .3. A parallel build, say 'make -j 10' results in make trying to figure out how to build nutclient_authenticate.3 before building libnutclient_misc.3, and without a corresponding .txt in sight it gives up. Signed-off-by: Sam Varshavchik --- docs/man/Makefile.am | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am index 01702aa25c..0b76272aba 100644 --- a/docs/man/Makefile.am +++ b/docs/man/Makefile.am @@ -172,6 +172,15 @@ SRC_DEV_PAGES = \ if WITH_MANS # NOTE: nutclient_*.3 has no source counterpart (libnutclient_*.txt) + +LIBNUTCLIENT_MISC_DEPS= + nutclient_authenticate.3 \ + nutclient_logout.3 \ + nutclient_device_login.3 \ + nutclient_get_device_num_logins.3 \ + nutclient_device_master.3 \ + nutclient_device_forced_shutdown.3 + MAN3_DEV_PAGES = \ upsclient.3 \ upscli_add_host_cert.3 \ @@ -197,16 +206,12 @@ MAN3_DEV_PAGES = \ libnutclient_misc.3 \ libnutclient_tcp.3 \ libnutclient_variables.3 \ - nutclient_authenticate.3 \ + $(LIBNUTCLIENT_MISC_DEPS) nutclient_destroy.3 \ - nutclient_device_forced_shutdown.3 \ - nutclient_device_login.3 \ - nutclient_device_master.3 \ nutclient_execute_device_command.3 \ nutclient_get_device_command_description.3 \ nutclient_get_device_commands.3 \ nutclient_get_device_description.3 \ - nutclient_get_device_num_logins.3 \ nutclient_get_device_rw_variables.3 \ nutclient_get_devices.3 \ nutclient_get_device_variable_description.3 \ @@ -215,7 +220,6 @@ MAN3_DEV_PAGES = \ nutclient_has_device.3 \ nutclient_has_device_command.3 \ nutclient_has_device_variable.3 \ - nutclient_logout.3 \ nutclient_set_device_variable_value.3 \ nutclient_set_device_variable_values.3 \ nutclient_tcp_create_client.3 \ @@ -242,6 +246,9 @@ MAN3_DEV_PAGES = \ nutscan_get_serial_ports_list.3 \ nutscan_init.3 +$(LIBNUTCLIENT_MISC_DEPS): libnutclient_misc.3: + touch $@ + MAN1_DEV_PAGES = \ libupsclient-config.1 endif From a3a3d2dc51146bd094aad092b3715e01e2bbb683 Mon Sep 17 00:00:00 2001 From: Sam Varshavchik Date: Sun, 9 Apr 2017 09:07:56 -0400 Subject: [PATCH 2/2] Remove extra colon. --- docs/man/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am index 0b76272aba..2e8de57c1a 100644 --- a/docs/man/Makefile.am +++ b/docs/man/Makefile.am @@ -246,7 +246,7 @@ MAN3_DEV_PAGES = \ nutscan_get_serial_ports_list.3 \ nutscan_init.3 -$(LIBNUTCLIENT_MISC_DEPS): libnutclient_misc.3: +$(LIBNUTCLIENT_MISC_DEPS): libnutclient_misc.3 touch $@ MAN1_DEV_PAGES = \