summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2017-05-29 09:12:42 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2017-05-29 09:12:42 +0200
commitf69b920dbc9d9ca85f85d69c047d7fcef4188c37 (patch)
treea88171f77ff0aa86995abe21fddc8df3feb7bda4 /Makefile
parenta4c851f759cf51760223e63b3f06d29743d80031 (diff)
downloadvdr-f69b920dbc9d9ca85f85d69c047d7fcef4188c37.tar.gz
vdr-f69b920dbc9d9ca85f85d69c047d7fcef4188c37.tar.bz2
The Makefiles now use the macro $(Q) instead of a plain '@' in front of their commands, so that verbosity can be controlled by the user
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile23
1 files changed, 16 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 5b95dd0e..a13214a6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Makefile 4.4 2017/05/22 15:33:30 kls Exp $
+# $Id: Makefile 4.5 2017/05/29 08:48:42 kls Exp $
.DELETE_ON_ERROR:
@@ -52,6 +52,15 @@ DOXYFILE = Doxyfile
-include Make.config
+# Output control
+
+ifdef VERBOSE
+Q =
+else
+Q = @
+endif
+export Q
+
# Mandatory compiler flags:
CFLAGS += -fPIC
@@ -122,7 +131,7 @@ all: vdr i18n plugins
%.o: %.c
@echo CC $@
- @$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+ $(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
# Dependencies:
@@ -137,7 +146,7 @@ $(DEPFILE): Makefile
vdr: $(OBJS) $(SILIB)
@echo LD $@
- @$(CXX) $(CXXFLAGS) -rdynamic $(LDFLAGS) $(OBJS) $(LIBS) $(SILIB) -o vdr
+ $(Q)$(CXX) $(CXXFLAGS) -rdynamic $(LDFLAGS) $(OBJS) $(LIBS) $(SILIB) -o vdr
# The libsi library:
@@ -180,20 +189,20 @@ I18Npot = $(PODIR)/vdr.pot
%.mo: %.po
@echo MO $@
- @msgfmt -c -o $@ $<
+ $(Q)msgfmt -c -o $@ $<
$(I18Npot): $(wildcard *.c)
@echo GT $@
- @xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
+ $(Q)xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=VDR --package-version=$(VDRVERSION) --msgid-bugs-address='<vdr-bugs@tvdr.de>' -o $@ `ls $^`
%.po: $(I18Npot)
@echo PO $@
- @msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+ $(Q)msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
@touch $@
$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr.mo: $(PODIR)/%.mo
@echo IN $@
- @install -D -m644 $< $@
+ $(Q)install -D -m644 $< $@
.PHONY: i18n
i18n: $(I18Nmsgs)