From 0c2a6b1baf5e3a3c29f044ccf377d5fb6c12f4ed Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 17 Jul 2016 20:54:00 +0200 Subject: [PATCH] build: Rename command list variables. The old names, xxx_command_lists and man_util_command_lists are not accurate any more, and unnecessarily clumsy to boot. This patch renames the variables to xxx_commands and all_commands and sorts the three affected sections of the Makefile alphabetically to reduce the risk of future merge conflicts. --- Makefile.real | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile.real b/Makefile.real index 4ef8b2be..b607ada4 100644 --- a/Makefile.real +++ b/Makefile.real @@ -148,32 +148,32 @@ else Q := @ endif -audiod_command_lists := $(addprefix $(lls_suite_dir)/, \ +audiod_commands := $(addprefix $(lls_suite_dir)/, \ $(addsuffix _cmd.lsg.man, audiod recv filter write)) -filter_command_lists := $(lls_suite_dir)/filter_cmd.lsg.man -play_command_lists := $(lls_suite_dir)/play_cmd.lsg.man -recv_command_lists := $(lls_suite_dir)/recv_cmd.lsg.man -server_command_lists := $(lls_suite_dir)/server_cmd.lsg.man -write_command_lists := $(lls_suite_dir)/write_cmd.lsg.man - -$(man_dir)/para_server.1: $(server_command_lists) -$(man_dir)/para_filter.1: $(filter_command_lists) -$(man_dir)/para_write.1: $(write_command_lists) -$(man_dir)/para_audiod.1: $(audiod_command_lists) -$(man_dir)/para_play.1: $(play_command_lists) -$(man_dir)/para_recv.1: $(recv_command_lists) - -$(man_dir)/para_server.1: man_util_command_lists := $(server_command_lists) -$(man_dir)/para_filter.1: man_util_command_lists := $(filter_command_lists) -$(man_dir)/para_write.1: man_util_command_lists := $(write_command_lists) -$(man_dir)/para_audiod.1: man_util_command_lists := $(audiod_command_lists) -$(man_dir)/para_play.1: man_util_command_lists := $(play_command_lists) -$(man_dir)/para_recv.1: man_util_command_lists := $(recv_command_lists) +filter_commands := $(lls_suite_dir)/filter_cmd.lsg.man +play_commands := $(lls_suite_dir)/play_cmd.lsg.man +recv_commands := $(lls_suite_dir)/recv_cmd.lsg.man +server_commands := $(lls_suite_dir)/server_cmd.lsg.man +write_commands := $(lls_suite_dir)/write_cmd.lsg.man + +$(man_dir)/para_audiod.1: $(audiod_commands) +$(man_dir)/para_filter.1: $(filter_commands) +$(man_dir)/para_play.1: $(play_commands) +$(man_dir)/para_recv.1: $(recv_commands) +$(man_dir)/para_server.1: $(server_commands) +$(man_dir)/para_write.1: $(write_commands) + +$(man_dir)/para_audiod.1: all_commands := $(audiod_commands) +$(man_dir)/para_filter.1: all_commands := $(filter_commands) +$(man_dir)/para_play.1: all_commands := $(play_commands) +$(man_dir)/para_recv.1: all_commands := $(recv_commands) +$(man_dir)/para_server.1: all_commands := $(server_commands) +$(man_dir)/para_write.1: all_commands := $(write_commands) $(man_dir)/para_%.1: $(lls_suite_dir)/%.lsg.man \ $(lls_m4_dir)/copyright.m4 | $(man_dir) @[ -z "$(Q)" ] || echo 'LLSMAN $<' - $(Q) cat $< $(man_util_command_lists) > $@ + $(Q) cat $< $(all_commands) > $@ $(Q) $(M4) -D COPYRIGHT_YEAR=$(COPYRIGHT_YEAR) $(lls_m4_dir)/copyright.m4 >> $@ $(object_dir)/%.o: %.c | $(object_dir) -- 2.39.5