From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: [PATCHv2 1/8] Makefile: apply dependencies consistently to sparse/asm targets Date: Tue, 19 Jun 2012 19:23:11 -0400 Message-ID: <20120619232310.GA6496@sigill.intra.peff.net> References: <20120619232231.GA6328@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Thomas Rast , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Jun 20 01:23:18 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Sh7lV-0004sV-DI for gcvg-git-2@plane.gmane.org; Wed, 20 Jun 2012 01:23:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750974Ab2FSXXO (ORCPT ); Tue, 19 Jun 2012 19:23:14 -0400 Received: from 99-108-225-23.lightspeed.iplsin.sbcglobal.net ([99.108.225.23]:33134 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750756Ab2FSXXN (ORCPT ); Tue, 19 Jun 2012 19:23:13 -0400 Received: (qmail 15722 invoked by uid 107); 19 Jun 2012 23:23:13 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Tue, 19 Jun 2012 19:23:13 -0400 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Tue, 19 Jun 2012 19:23:11 -0400 Content-Disposition: inline In-Reply-To: <20120619232231.GA6328@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: When a C file includes a header file or depends on a command-line "-D" macro, we note it in the Makefile like: git.o: common-cmds.h However, other targets built from the C file should also know about this dependency (in particular, .sp and .s files that are not part of the usual build process). We sometimes noted these and sometimes not; let's make sure they are always included. Signed-off-by: Jeff King --- Same as v1. Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 62de0b4..537d2ea 100644 --- a/Makefile +++ b/Makefile @@ -1972,7 +1972,7 @@ shell_compatibility_test: please_set_SHELL_PATH_to_a_more_modern_shell strip: $(PROGRAMS) git$X $(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X -git.o: common-cmds.h +git.sp git.s git.o: common-cmds.h git.sp git.s git.o: EXTRA_CPPFLAGS = \ '-DGIT_HTML_PATH="$(htmldir_SQ)"' \ '-DGIT_MAN_PATH="$(mandir_SQ)"' \ @@ -1982,9 +1982,9 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \ $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS) -help.sp help.o: common-cmds.h +help.sp help.s help.o: common-cmds.h -builtin/help.sp builtin/help.o: common-cmds.h +builtin/help.sp builtin/help.s builtin/help.o: common-cmds.h builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \ '-DGIT_HTML_PATH="$(htmldir_SQ)"' \ '-DGIT_MAN_PATH="$(mandir_SQ)"' \ -- 1.7.11.rc3.5.g201460b