From 479aa2726ef127a1d6c492d49f7a4cddf279be0a Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sat, 24 Jun 2023 23:10:09 +0200 Subject: [PATCH] build: Rename all_objs -> dep_objs. The old name is misleading since there are additional objects which correspond to the C files generated by lopsub. Those use different dependency tracking. Simplify the code a bit by creating the list in one step. --- Makefile.real | 7 +++---- t/makefile.test | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.real b/Makefile.real index 117d72fa..92a5724b 100644 --- a/Makefile.real +++ b/Makefile.real @@ -287,11 +287,10 @@ ifeq ($(HAVE_READLINE),yes) endif # sort removes duplicate words, which is all we need here -all_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \ +dep_objs := $(sort $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \ $(audiod_objs) $(audioc_objs) $(mixer_objs) $(server_objs) \ - $(write_objs) $(afh_objs) $(play_objs)) -deps := $(addprefix $(dep_dir)/, $(all_objs:.o=.d)) -deps += $(addprefix $(dep_dir)/, mp.bison.d mp.flex.d) + $(write_objs) $(afh_objs) $(play_objs) mp.bison mp.flex) +deps := $(addprefix $(dep_dir)/, $(dep_objs:.o=.d)) afh_objs += afh.lsg.o audioc_objs += audioc.lsg.o diff --git a/t/makefile.test b/t/makefile.test index 904c7793..1ef3ac69 100644 --- a/t/makefile.test +++ b/t/makefile.test @@ -7,7 +7,7 @@ test_options := --executables-dir $(shell pwd) test_options += --results-dir $(results_dir) test_options += --trash-dir $(trash_dir) test_options += --executables "$(prefixed_executables)" -test_options += --objects "$(basename $(all_objs))" +test_options += --objects "$(basename $(dep_objs))" test_options += --man-dir $(man_dir) ifdef V -- 2.39.2