From 993235bdcc83a11f704e32d60b7dfe3f387eb036 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 4 Nov 2007 10:18:45 +0100 Subject: [PATCH] Improved the 'i18n' target in the Makefile to avoid unnecessary work --- CONTRIBUTORS | 1 + HISTORY | 4 +++- Makefile | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index ae1c20bf..a5ac694e 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -222,6 +222,7 @@ Stefan Huelswitt for reporting a double fdopen() in cPipe::Open() for suggesting to increase the APIVERSION to allow plugins that relied on the cStatus::MsgSetVolume() bug to react properly + for improving the 'i18n' target in the Makefile to avoid unnecessary work Ulrich Röder for pointing out that there are channels that have a symbol rate higher than 27500 diff --git a/HISTORY b/HISTORY index 00b106da..aafd062a 100644 --- a/HISTORY +++ b/HISTORY @@ -5488,7 +5488,7 @@ Video Disk Recorder Revision History both opening and closing section filters (thanks to Rolf Ahrenberg). - Some fixes to PLUGINS.html (thanks to Rolf Ahrenberg). -2007-11-03: Version 1.5.11 +2007-11-04: Version 1.5.11 - Fixed checking compatibility mode for old subtitles plugin (thanks to Marco Schlüßler). @@ -5510,3 +5510,5 @@ Video Disk Recorder Revision History - The 'Allowed' parameter in cMenuEditStrItem() is now NULL by default, which results in using tr(FileNameChars) (suggested by Thomas Günther). - Added a missing '.' to the date returned by DayDateTime() (thanks to Lauri Nurmi). +- Improved the 'i18n' target in the Makefile to avoid unnecessary work (thanks to + Stefan Huelswitt). diff --git a/Makefile b/Makefile index 26b6c012..f32773c8 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 1.109 2007/11/03 14:46:29 kls Exp $ +# $Id: Makefile 1.110 2007/11/04 10:15:59 kls Exp $ .DELETE_ON_ERROR: @@ -106,25 +106,25 @@ $(SILIB): PODIR = po LOCALEDIR = locale I18Npo = $(wildcard $(PODIR)/*.po) -I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) -I18Ndirs = $(notdir $(foreach file, $(I18Npo), $(basename $(file)))) +I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) I18Npot = $(PODIR)/vdr.pot %.mo: %.po msgfmt -c -o $@ $< $(I18Npot): $(wildcard *.c) - xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='' -o $@ $(wildcard *.c) + xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='' -o $@ $^ -$(I18Npo): $(I18Npot) +%.po: $(I18Npot) msgmerge -U --no-wrap --no-location --backup=none -q $@ $< + @touch $@ -i18n: $(I18Nmo) - @mkdir -p $(LOCALEDIR) - for i in $(I18Ndirs); do\ - mkdir -p $(LOCALEDIR)/$$i/LC_MESSAGES;\ - cp $(PODIR)/$$i.mo $(LOCALEDIR)/$$i/LC_MESSAGES/vdr.mo;\ - done +$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr.mo: $(PODIR)/%.mo + @mkdir -p $(dir $@) + cp $< $@ + +.PHONY: i18n +i18n: $(I18Nmsgs) install-i18n: @mkdir -p $(DESTDIR)$(LOCDIR)