[FFmpeg-cvslog] r22526 - in trunk: Makefile common.mak

mru subversion
Sun Mar 14 20:48:09 CET 2010


Author: mru
Date: Sun Mar 14 20:48:09 2010
New Revision: 22526

Log:
Fix brief make output for generated tables

Modified:
   trunk/Makefile
   trunk/common.mak

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Mar 14 20:30:25 2010	(r22525)
+++ trunk/Makefile	Sun Mar 14 20:48:09 2010	(r22526)
@@ -105,15 +105,15 @@ documentation: $(addprefix doc/, develop
                                  ffplay-doc.html ffprobe-doc.html ffserver-doc.html \
                                  general.html libavfilter.html $(ALLMANPAGES))
 
-doc/%.html: MSG = HTML
+doc/%.html: TAG = HTML
 doc/%.html: doc/%.texi
 	$(M)cd doc && texi2html -monolithic -number $(<:doc/%=%)
 
-doc/%.pod: MSG = POD
+doc/%.pod: TAG = POD
 doc/%.pod: doc/%-doc.texi
 	$(M)doc/texi2pod.pl $< $@
 
-doc/%.1: MSG = MAN
+doc/%.1: TAG = MAN
 doc/%.1: doc/%.pod
 	$(M)pod2man --section=1 --center=" " --release=" " $< > $@
 

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	Sun Mar 14 20:30:25 2010	(r22525)
+++ trunk/common.mak	Sun Mar 14 20:48:09 2010	(r22526)
@@ -24,7 +24,7 @@ ECHO   = printf "$(1)\t%s\n" $(2)
 BRIEF  = CC AS YASM AR LD HOSTCC RANLIB STRIP CP
 SILENT = DEPCC YASMDEP RM
 MSG    = $@
-M      = @$(call ECHO,$(MSG),$@);
+M      = @$(call ECHO,$(TAG),$@);
 $(foreach VAR,$(BRIEF), \
     $(eval $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
 $(foreach VAR,$(SILENT),$(eval $(VAR) = @$($(VAR))))
@@ -52,7 +52,7 @@ CFLAGS   += $(ECFLAGS)
 %.ver: %.v
 	$(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
 
-%.c %.h: MSG = GEN
+%.c %.h: TAG = GEN
 
 install: install-libs install-headers
 install-libs: install-libs-yes



More information about the ffmpeg-cvslog mailing list