From fe343286ec5564606f29aa94848bc5dc3b2b3709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Fri, 24 Jun 2011 19:53:28 +0200 Subject: [PATCH] Restore some more rules to common.mak to improve building in subdirs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Reimar Döffinger --- Makefile | 11 ----------- common.mak | 10 ++++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 966afc636b..8b3a51fb6f 100644 --- a/Makefile +++ b/Makefile @@ -7,9 +7,6 @@ vpath %.asm $(SRC_PATH) vpath %.v $(SRC_PATH) vpath %.texi $(SRC_PATH) -# Do not delete intermediate files from chains of implicit rules -$(OBJS): - PROGS-$(CONFIG_FFMPEG) += ffmpeg PROGS-$(CONFIG_FFPLAY) += ffplay PROGS-$(CONFIG_FFPROBE) += ffprobe @@ -153,13 +150,5 @@ check: test include doc/Makefile include tests/Makefile -# Dummy rule to stop make trying to rebuild removed or renamed headers -%.h: - @: - -# Disable suffix rules. Most of the builtin rules are suffix rules, -# so this saves some time on slow systems. -.SUFFIXES: - .PHONY: all alltools *clean check config examples install* .PHONY: testprogs uninstall* diff --git a/common.mak b/common.mak index 98ec53e611..9a59f77fdd 100644 --- a/common.mak +++ b/common.mak @@ -49,6 +49,16 @@ HOSTCFLAGS += $(IFLAGS) %.c %.h: TAG = GEN +# Dummy rule to stop make trying to rebuild removed or renamed headers +%.h: + @: + +# Disable suffix rules. Most of the builtin rules are suffix rules, +# so this saves some time on slow systems. +.SUFFIXES: + +# Do not delete intermediate files from chains of implicit rules +$(OBJS): endif OBJS-$(HAVE_MMX) += $(MMX-OBJS-yes)