From c8868748a8203afe5a63a0fffa2b58cbab8d43ce Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Sun, 4 Jun 2017 23:02:13 +0300 Subject: [PATCH] Adapt VDR's Makefile style again. --- Makefile | 20 ++++++++++---------- femon.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index f0b4250..72ed2f6 100644 --- a/Makefile +++ b/Makefile @@ -71,14 +71,14 @@ all: $(SOFILE) i18n %.o: %.c @echo CC $@ - @$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $< + $(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $< ### Dependencies: MAKEDEP = $(CXX) -MM -MG DEPFILE = .dependencies $(DEPFILE): Makefile - @$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ + $(Q)$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ -include $(DEPFILE) @@ -92,20 +92,20 @@ I18Npot = $(PODIR)/$(PLUGIN).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-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='' -o $@ `ls $^` + $(Q)xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='' -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): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo @echo IN $@ - @install -D -m644 $< $@ + $(Q)install -D -m644 $< $@ .PHONY: i18n i18n: $(I18Nmo) $(I18Npot) @@ -116,12 +116,12 @@ install-i18n: $(I18Nmsgs) $(SOFILE): $(OBJS) @echo LD $@ - @$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ - @$(STRIP) $@ + $(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ + $(Q)$(STRIP) $@ install-lib: $(SOFILE) @echo IN $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) - @install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) + $(Q)install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib install-i18n @@ -139,4 +139,4 @@ clean: .PHONY: cppcheck cppcheck: - @cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c) + $(Q)cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c) diff --git a/femon.c b/femon.c index 144135f..2c665a0 100644 --- a/femon.c +++ b/femon.c @@ -17,8 +17,8 @@ #include "tools.h" #include "setup.h" -#if defined(APIVERSNUM) && APIVERSNUM < 20305 -#error "VDR-2.3.5 API version or greater is required!" +#if defined(APIVERSNUM) && APIVERSNUM < 20306 +#error "VDR-2.3.6 API version or greater is required!" #endif #ifndef GITVERSION