From 347cc5d773017d1dfeac0781541b618627cf7bd9 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@tuebingen.mpg.de>
Date: Wed, 29 Jun 2016 22:21:35 +0200
Subject: [PATCH] build: Remove some unused variables from Makefile.real.

All executables are converted, so $converted_executables is the same
as $executables, modulo executables which can not be built (and are
thus irrelevant). Similarly, $unconverted_executables is empty and
can be removed as well.

The $m4_deps variable was only used for the gengetopt files, so this
can also be removed, along with $ggo_dir.

$help2man_dir used to contain the path to the directory for the output
files of help2man. Since we now generate the man pages with lopsubgen,
$help2man_dir has become unused and can be removed.
---
 Makefile.real | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/Makefile.real b/Makefile.real
index ca2bab53..ca758e50 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -26,13 +26,11 @@ ifeq ("$(origin O)", "command line")
 else
 	build_dir := build
 endif
-ggo_dir := $(build_dir)/ggo
 object_dir := $(build_dir)/objects
 dep_dir := $(build_dir)/deps
 man_dir := $(build_dir)/man/man1
 cmdline_dir := $(build_dir)/cmdline
 m4depdir := $(build_dir)/m4deps
-help2man_dir := $(build_dir)/help2man
 lls_suite_dir := $(build_dir)/lls
 lls_m4_dir := m4/lls
 test_dir := t
@@ -42,8 +40,6 @@ all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \
 	$(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \
 	$(write_objs) $(afh_objs) $(play_objs))
 deps := $(addprefix $(dep_dir)/, $(filter-out %.cmdline.d, $(all_objs:.o=.d)))
-converted_executables := audioc client fade play recv write filter gui afh audiod server
-unconverted_executables := $(filter-out $(converted_executables), $(executables))
 
 afh_objs += afh.lsg.o
 audioc_objs += audioc.lsg.o
@@ -58,7 +54,6 @@ recv_objs += recv_cmd.lsg.o recv.lsg.o
 server_objs += server_cmd.lsg.o server.lsg.o
 write_objs += write_cmd.lsg.o write.lsg.o
 
-m4_deps := $(addprefix $(m4depdir)/, $(addsuffix .m4d, $(unconverted_executables)))
 m4_lls_deps := \
 	audiod_cmd \
 	server_cmd \
@@ -66,7 +61,7 @@ m4_lls_deps := \
 	recv_cmd \
 	filter_cmd \
 	write_cmd \
-	$(converted_executables)
+	$(executables)
 m4_lls_deps := $(addprefix $(lls_suite_dir)/, $(addsuffix .m4d, $(m4_lls_deps)))
 
 # now prefix all objects with object dir
@@ -98,12 +93,10 @@ include $(lls_m4_dir)/makefile
 include $(test_dir)/makefile.test
 ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
--include $(m4_deps)
 -include $(m4_lls_deps)
 endif
 
-$(object_dir) $(man_dir) $(ggo_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) \
-		$(help2man_dir) $(lls_suite_dir):
+$(object_dir) $(man_dir) $(cmdline_dir) $(dep_dir) $(m4depdir) $(lls_suite_dir):
 	$(Q) $(MKDIR_P) $@
 
 CPPFLAGS += -DBINDIR='"$(bindir)"'
-- 
2.39.2