Browse code

Replace $(G) with more generic $(M) in silent make rules

Originally committed as revision 22419 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård authored on 2010/03/10 11:56:52
Showing 2 changed files
... ...
@@ -24,7 +24,6 @@ ECHO   = printf "$(1)\t%s\n" $(2)
24 24
 BRIEF  = CC AS YASM AR LD HOSTCC RANLIB STRIP CP
25 25
 SILENT = DEPCC YASMDEP RM
26 26
 MSG    = $@
27
-G      = @$(call ECHO,GEN,$@);
28 27
 M      = @$(call ECHO,$(MSG),$@);
29 28
 $(foreach VAR,$(BRIEF), \
30 29
     $(eval $(VAR) = @$$(call ECHO,$(VAR),$$(MSG)); $($(VAR))))
... ...
@@ -53,13 +52,15 @@ CFLAGS   += $(ECFLAGS)
53 53
 %.ver: %.v
54 54
 	$(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
55 55
 
56
+%.c %.h: MSG = GEN
57
+
56 58
 SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
57 59
 ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
58 60
 $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES)
59 61
 endif
60 62
 
61 63
 $(BUILD_ROOT_REL)/version.h: $(SRC_PATH_BARE)/version.sh config.mak
62
-	$(G)$< $(SRC_PATH) $@ $(EXTRA_VERSION)
64
+	$(M)$< $(SRC_PATH) $@ $(EXTRA_VERSION)
63 65
 
64 66
 install: install-libs install-headers
65 67
 install-libs: install-libs-yes
... ...
@@ -736,10 +736,10 @@ include $(SUBDIR)../subdir.mak
736 736
 $(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o
737 737
 
738 738
 $(SUBDIR)cos_tables.c: $(SUBDIR)costablegen$(HOSTEXESUF)
739
-	$(G)./$< > $@
739
+	$(M)./$< > $@
740 740
 
741 741
 $(SUBDIR)sin_tables.c: $(SUBDIR)costablegen$(HOSTEXESUF)
742
-	$(G)./$< sin > $@
742
+	$(M)./$< sin > $@
743 743
 
744 744
 ifdef CONFIG_MPEGAUDIO_HP
745 745
 $(SUBDIR)mpegaudio_tablegen$(HOSTEXESUF): HOSTCFLAGS += -DFRAC_BITS=23
... ...
@@ -753,7 +753,7 @@ $(SUBDIR)%_tablegen$(HOSTEXESUF): $(SUBDIR)%_tablegen.c $(SUBDIR)tableprint.c
753 753
 	$(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ $(HOSTLIBS)
754 754
 
755 755
 $(SUBDIR)%_tables.h: $(SUBDIR)%_tablegen$(HOSTEXESUF)
756
-	$(G)./$< > $@
756
+	$(M)./$< > $@
757 757
 
758 758
 ifdef CONFIG_HARDCODED_TABLES
759 759
 $(SUBDIR)mdct.o: $(SUBDIR)mdct_tables.h