From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Feb 2013 00:13:52 +0000 (-0800)
Subject: Merge branch 'jn/auto-depend-workaround-buggy-ccache'
X-Git-Tag: v1.8.2-rc0~49
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b36ab1abd3f908a996f13c8eebe597d9b43b868b?hp=e34c7e2b51c02a761a034b877b852dc0dbccf101

Merge branch 'jn/auto-depend-workaround-buggy-ccache'

An age-old workaround to prevent buggy versions of ccache from
breaking the auto-generation of dependencies, which unfortunately
is still relevant because some people use ancient distros.

* jn/auto-depend-workaround-buggy-ccache:
Makefile: explicitly set target name for autogenerated dependencies
---

diff --git a/Makefile b/Makefile
index 731b6a8834..5a2e02df45 100644
--- a/Makefile
+++ b/Makefile
@@ -973,7 +973,8 @@ endif
 
 ifeq ($(COMPUTE_HEADER_DEPENDENCIES),auto)
 dep_check = $(shell $(CC) $(ALL_CFLAGS) \
-	-c -MF /dev/null -MMD -MP -x c /dev/null -o /dev/null 2>&1; \
+	-c -MF /dev/null -MQ /dev/null -MMD -MP \
+	-x c /dev/null -o /dev/null 2>&1; \
 	echo $$?)
 ifeq ($(dep_check),0)
 override COMPUTE_HEADER_DEPENDENCIES = yes
@@ -1843,7 +1844,7 @@ $(dep_dirs):
 
 missing_dep_dirs := $(filter-out $(wildcard $(dep_dirs)),$(dep_dirs))
 dep_file = $(dir $@).depend/$(notdir $@).d
-dep_args = -MF $(dep_file) -MMD -MP
+dep_args = -MF $(dep_file) -MQ $@ -MMD -MP
 ifdef CHECK_HEADER_DEPENDENCIES
 $(error cannot compute header dependencies outside a normal build. \
 Please unset CHECK_HEADER_DEPENDENCIES and try again)