[FFmpeg-cvslog] Restore some more rules to common.mak to improve building in subdirs.
Reimar Döffinger
git at videolan.org
Sat Jun 25 19:16:13 CEST 2011
ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Fri Jun 24 19:53:28 2011 +0200| [fe343286ec5564606f29aa94848bc5dc3b2b3709] | committer: Reimar Döffinger
Restore some more rules to common.mak to improve building in subdirs.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe343286ec5564606f29aa94848bc5dc3b2b3709
---
Makefile | 11 -----------
common.mak | 10 ++++++++++
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 966afc6..8b3a51f 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 98ec53e..9a59f77 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)
More information about the ffmpeg-cvslog
mailing list