From 93bff1de770e95c79bcf2ec794d05ef6b64ec7af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Wed, 10 Mar 2010 02:56:52 +0000
Subject: [PATCH] Replace $(G) with more generic $(M) in silent make rules
Originally committed as revision 22419 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
common.mak | 5 +++--
libavcodec/Makefile | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/common.mak b/common.mak
index 46525b56dcf..36788e5cfef 100644
--- a/common.mak
+++ b/common.mak
@@ -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
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 756b10abacb..6bd26cc495f 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -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
--
GitLab