Replace $(G) with more generic $(M) in silent make rules
authorMåns Rullgård <mans@mansr.com>
Wed, 10 Mar 2010 02:56:52 +0000 (02:56 +0000)
committerMåns Rullgård <mans@mansr.com>
Wed, 10 Mar 2010 02:56:52 +0000 (02:56 +0000)
Originally committed as revision 22419 to svn://svn.ffmpeg.org/ffmpeg/trunk

common.mak
libavcodec/Makefile

index 46525b5..36788e5 100644 (file)
@@ -24,7 +24,6 @@ ECHO   = printf "$(1)\t%s\n" $(2)
 BRIEF  = CC AS YASM AR LD HOSTCC RANLIB STRIP CP
 SILENT = DEPCC YASMDEP RM
 MSG    = $@
-G      = @$(call ECHO,GEN,$@);
 M      = @$(call ECHO,$(MSG),$@);
 $(foreach VAR,$(BRIEF), \
     $(eval $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
@@ -53,13 +52,15 @@ CFLAGS   += $(ECFLAGS)
 %.ver: %.v
        $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
 
+%.c %.h: MSG = GEN
+
 SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
 ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
 $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES)
 endif
 
 $(BUILD_ROOT_REL)/version.h: $(SRC_PATH_BARE)/version.sh config.mak
-       $(G)$< $(SRC_PATH) $@ $(EXTRA_VERSION)
+       $(M)$< $(SRC_PATH) $@ $(EXTRA_VERSION)
 
 install: install-libs install-headers
 install-libs: install-libs-yes
index 756b10a..6bd26cc 100644 (file)
@@ -736,10 +736,10 @@ include $(SUBDIR)../subdir.mak
 $(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o
 
 $(SUBDIR)cos_tables.c: $(SUBDIR)costablegen$(HOSTEXESUF)
-       $(G)./$< > $@
+       $(M)./$< > $@
 
 $(SUBDIR)sin_tables.c: $(SUBDIR)costablegen$(HOSTEXESUF)
-       $(G)./$< sin > $@
+       $(M)./$< sin > $@
 
 ifdef CONFIG_MPEGAUDIO_HP
 $(SUBDIR)mpegaudio_tablegen$(HOSTEXESUF): HOSTCFLAGS += -DFRAC_BITS=23
@@ -753,7 +753,7 @@ $(SUBDIR)%_tablegen$(HOSTEXESUF): $(SUBDIR)%_tablegen.c $(SUBDIR)tableprint.c
        $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ $(HOSTLIBS)
 
 $(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen$(HOSTEXESUF)
-       $(G)./$< > $@
+       $(M)./$< > $@
 
 ifdef CONFIG_HARDCODED_TABLES
 $(SUBDIR)mdct.o: $(SUBDIR)mdct_tables.h