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.

diff --git a/Makefile.in b/Makefile.in
index e4a3dd3f068f72bf2ff8655e5c8a482f87c68dc7..72f66a9049c2940cc08e7b6f68cb49c7912cd34f 100644 (file)
--- 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)
 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)
 -include $(all_objs:.o=.d)

+endif

 
 para_recv: $(recv_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'
 
 para_recv: $(recv_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'

diff --git a/autogen.sh b/autogen.sh
index 5c3d931d8a4e43c99e46d9b20031d7ee30fe6ccc..76eaef2f38cad05ffd41d0bd7291f51601efcac7 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,8 +5,9 @@ if test -f Makefile; then
 fi
 aclocal -I . &> /dev/null
 autoconf
 fi
 aclocal -I . &> /dev/null
 autoconf

-autoheader 
+autoheader

 echo configuring...
 ./configure $@ > /dev/null
 echo compiling...
 echo configuring...
 ./configure $@ > /dev/null
 echo compiling...

-make clean all > /dev/null
+make clean2 &> /dev/null
+make > /dev/null