diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-24 19:53:28 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-06-25 19:15:39 +0200 |
| commit | fe343286ec5564606f29aa94848bc5dc3b2b3709 (patch) | |
| tree | e5cbd17fde769cd7bc0dc0ecfb096fce7d402c46 | |
| parent | 392aa6e444f13aaddcf3d215b1058640a2ada846 (diff) | |
| download | ffmpeg-fe343286ec5564606f29aa94848bc5dc3b2b3709.tar.gz | |
Restore some more rules to common.mak to improve building in subdirs.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | common.mak | 10 |
2 files changed, 10 insertions, 11 deletions
@@ -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) |