From 29a76173bada691ffec82335982c490963f965bc Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sat, 19 Dec 2009 14:14:45 +0100 Subject: [PATCH] Do not include dependency files if make command goals contain "clean". Calling "make clean2" was particularly annoying because it first regenerated the dependency files it is supposed to remove. Unfortunately, this patch breaks multiple goals if one of them matches "clean". For example "make clean all" does no longer work. But as this can easily be worked around by calling "make clean && make all", we don't care. --- Makefile.in | 3 +++ autogen.sh | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index e4a3dd3f..72f66a90 100644 --- a/Makefile.in +++ b/Makefile.in @@ -210,7 +210,10 @@ afh_objs := $(addprefix $(object_dir)/, @afh_objs@) all_objs := $(recv_objs) $(filter_objs) $(client_objs) $(gui_objs) \ $(audiod_objs) $(audioc_objs) $(fade_objs) $(server_objs) \ $(write_objs) $(afh_objs) + +ifeq ($(findstring clean, $(MAKECMDGOALS)),) -include $(all_objs:.o=.d) +endif para_recv: $(recv_objs) @[ -z "$(Q)" ] || echo 'LD $@' diff --git a/autogen.sh b/autogen.sh index 5c3d931d..76eaef2f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,8 +5,9 @@ if test -f Makefile; then fi aclocal -I . &> /dev/null autoconf -autoheader +autoheader echo configuring... ./configure $@ > /dev/null echo compiling... -make clean all > /dev/null +make clean2 &> /dev/null +make > /dev/null -- 2.39.5