Mercurial > mplayer.hg
changeset 31870:e061d5d981ba
Sync with current FFmpeg HEAD.
| author | diego |
|---|---|
| date | Tue, 10 Aug 2010 00:36:53 +0000 |
| parents | bf2ae700517d |
| children | c3775dbb8509 |
| files | common.mak |
| diffstat | 1 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/common.mak Sun Aug 08 19:01:18 2010 +0000 +++ b/common.mak Tue Aug 10 00:36:53 2010 +0000 @@ -26,16 +26,19 @@ MSG = $@ M = @$(call ECHO,$(TAG),$@); $(foreach VAR,$(BRIEF), \ - $(eval $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR)))) -$(foreach VAR,$(SILENT),$(eval $(VAR) = @$($(VAR)))) + $(eval override $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR)))) +$(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR)))) $(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL)) endif -ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale +ALLFFLIBS = avcodec avcore avdevice avfilter avformat avutil postproc swscale -CPPFLAGS := -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(CPPFLAGS) +IFLAGS := -I$(BUILD_ROOT_REL) -I$(SRC_PATH) +CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CFLAGS += $(ECFLAGS) +HOSTCFLAGS += $(IFLAGS) + %.o: %.c $(CCDEP) $(CC) $(CPPFLAGS) $(CFLAGS) $(CC_DEPFLAGS) -c $(CC_O) $< @@ -54,6 +57,10 @@ %.c %.h: TAG = GEN +# Dummy rule to stop make trying to rebuild removed or renamed headers +%.h: + @: + install: install-libs install-headers install-libs: install-libs-yes