From 5094a3fd048e06a49bb232ae7eb09821c512c8a0 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 22 Apr 2018 10:11:09 +0100 Subject: Rework use of split-messages to clean up and use -z --- Makefile | 10 +++------- frontends/atari/Makefile | 3 ++- frontends/framebuffer/Makefile | 3 ++- frontends/windows/Makefile | 1 + 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 0ce9cdd99..a4c5949d8 100644 --- a/Makefile +++ b/Makefile @@ -651,16 +651,12 @@ S_COMMON := \ # Message splitting rule generation macro # 1 = Language define split_messages -.INTERMEDIATE:$$(MESSAGES_TARGET)/$(1)/Messages.tmp -$$(MESSAGES_TARGET)/$(1)/Messages.tmp: resources/FatMessages +$$(MESSAGES_TARGET)/$(1)/Messages: resources/FatMessages $$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)" $$(Q)$$(MKDIR) -p $$(MESSAGES_TARGET)/$(1) - $$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ $$< - -$$(MESSAGES_TARGET)/$(1)/Messages: $$(MESSAGES_TARGET)/$(1)/Messages.tmp - $$(VQ)echo "COMPRESS: $$@" - $$(Q)gzip -9n < $$< > $$@ + $$(Q)$$(RM) $$@ + $$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ -z $$< CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile index a2f27e2f2..f07543e79 100644 --- a/frontends/atari/Makefile +++ b/frontends/atari/Makefile @@ -177,7 +177,8 @@ endif $(Q)cp \!NetSurf/Resources/internal.css,f79 $(ATARI_TARGET_DIR)res/internal.css $(Q)cp \!NetSurf/Resources/SearchEngines $(ATARI_TARGET_DIR)res/search $(Q)cp \!NetSurf/Resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle - $(Q)$(SPLIT_MESSAGES) -l en -p atari -f messages resources/FatMessages > $(ATARI_TARGET_DIR)res/messages + $(Q)$(RM) $(ATARI_TARGET_DIR)res/messages + $(Q)$(SPLIT_MESSAGES) -l en -p atari -f messages -o $(ATARI_TARGET_DIR)res/messages resources/FatMessages $(Q)cp \!NetSurf/Resources/en/welcome.html,faf $(ATARI_TARGET_DIR)res/welcome.html $(Q)cp \!NetSurf/Resources/en/maps.html,faf $(ATARI_TARGET_DIR)res/maps.html $(Q)cp \!NetSurf/Resources/en/licence.html,faf $(ATARI_TARGET_DIR)res/licence.html diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile index 323ca6c96..055ef90e3 100644 --- a/frontends/framebuffer/Makefile +++ b/frontends/framebuffer/Makefile @@ -177,7 +177,8 @@ install-framebuffer: $(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES) $(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf-fb $(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL $(FRONTEND_RESOURCES_DIR)/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done - $(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages | gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages + $(Q)$(RM) $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages + $(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages -o $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages -z resources/FatMessages # ---------------------------------------------------------------------------- # Package target diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile index 50d0d4b44..de01ce33a 100644 --- a/frontends/windows/Makefile +++ b/frontends/windows/Makefile @@ -84,6 +84,7 @@ endif # installer messages generation $(OBJROOT)/messages-en: resources/FatMessages $(VQ)echo "MSGSPLIT: Language: en Filter: win" + $(Q)$(RM) $@ $(Q)$(SPLIT_MESSAGES) -l en -p win -f messages -o $@ $< netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ) -- cgit v1.2.3