highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore some more rules to common.mak to improve building in subdirs.

Browse Source 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2011-06-24 19:53:28 +02:00
parent 392aa6e444
commit fe343286ec
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -7,9 +7,6 @@ vpath %.asm $(SRC_PATH)
vpath %.v $(SRC_PATH) vpath %.v $(SRC_PATH)
vpath %.texi $(SRC_PATH) vpath %.texi $(SRC_PATH)
# Do not delete intermediate files from chains of implicit rules
$(OBJS):
PROGS-$(CONFIG_FFMPEG) += ffmpeg PROGS-$(CONFIG_FFMPEG) += ffmpeg
PROGS-$(CONFIG_FFPLAY) += ffplay PROGS-$(CONFIG_FFPLAY) += ffplay
PROGS-$(CONFIG_FFPROBE) += ffprobe PROGS-$(CONFIG_FFPROBE) += ffprobe
@ -153,13 +150,5 @@ check: test
include doc/Makefile include doc/Makefile
include tests/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: all alltools *clean check config examples install*
.PHONY: testprogs uninstall* .PHONY: testprogs uninstall*

10
common.mak
View File

@ -49,6 +49,16 @@ HOSTCFLAGS += $(IFLAGS)
%.c %.h: TAG = GEN %.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 endif
OBJS-$(HAVE_MMX) += $(MMX-OBJS-yes) OBJS-$(HAVE_MMX) += $(MMX-OBJS-yes)