From 264a6d82ea61f2df6da6ab4e34f5be814c3a7c7a Mon Sep 17 00:00:00 2001 From: Samuel Mannehed Date: Fri, 22 Oct 2021 09:42:17 +0200 Subject: [PATCH] Stop chained builds of .po and .json files The way we work with these translation files means that we only care about one step at a time, we don't want to update the .po files when building the 'update-js' target. Also, always force rebuilds of the .po and .json files. --- po/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/po/Makefile b/po/Makefile index 853d9a85..1513b38e 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,5 +1,6 @@ all: .PHONY: update-po update-js update-pot +.PHONY: FORCE LINGUAS := cs de el es fr ja ko nl pl pt_BR ru sv tr zh_CN zh_TW @@ -11,10 +12,10 @@ JSONFILES := $(addprefix ../app/locale/,$(addsuffix .json,$(LINGUAS))) update-po: $(POFILES) update-js: $(JSONFILES) -%.po: noVNC.pot - msgmerge --update --lang=$* $@ $< -../app/locale/%.json: %.po - ./po2js $< $@ +%.po: FORCE + msgmerge --update --lang=$* $@ noVNC.pot +../app/locale/%.json: FORCE + ./po2js $*.po $@ update-pot: xgettext --output=noVNC.js.pot \