[MPlayer-cvslog] r31951 - trunk/common.mak

[diego]

Author: diego
Date: Tue Aug 10 02:36:53 2010
New Revision: 31951

Log:
Sync with current FFmpeg HEAD.

Modified:
   trunk/common.mak

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	Sun Aug  8 21:01:18 2010	(r31950)
+++ trunk/common.mak	Tue Aug 10 02:36:53 2010	(r31951)
@@ -26,16 +26,19 @@ SILENT = DEPCC YASMDEP RM RANLIB
 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 @@ CFLAGS   += $(ECFLAGS)
 
 %.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