From 692da438554a34ad18f346e8b491012fc2afa9a3 Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Thu, 3 Nov 2022 21:42:02 +0000 Subject: BuildSystem: make package step depend on POSTEXES The POSTEXE stages might add more stuff to the package contents, so ensure they have completed before starting to package things up. --- frontends/amiga/Makefile | 2 +- frontends/atari/Makefile | 2 +- frontends/beos/Makefile | 2 +- frontends/riscos/Makefile | 2 +- frontends/windows/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index 99745c90e..f537a1163 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -80,7 +80,7 @@ AMIGA_DISTRIBUTION_FILES := $(FRONTEND_SOURCE_DIR)/dist/* AMIGA_PKG_DIR := $(FRONTEND_SOURCE_DIR)/pkg AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga -netsurf.lha: $(EXETARGET) +netsurf.lha: $(EXETARGET) $(POSTEXES) $(VQ)echo Creating netsurf.lha $(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR) $(Q)$(MKDIR) -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile index 6de15b62e..2f6d7118b 100644 --- a/frontends/atari/Makefile +++ b/frontends/atari/Makefile @@ -161,7 +161,7 @@ $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME): package-atari: $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME) $(PKGNAME) $(VQ)echo Creating $(PKGNAME) -$(PKGNAME): $(EXETARGET) +$(PKGNAME): $(EXETARGET) $(POSTEXES) ifneq ($(strip $(STRIP)),) $(Q)echo Stripping symbols from $(EXETARGET) with $(STRIP) $(Q)$(STRIP) $(EXETARGET) diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile index 46f12ec85..81c9326ee 100644 --- a/frontends/beos/Makefile +++ b/frontends/beos/Makefile @@ -151,7 +151,7 @@ install-beos: package-beos: $(PKGNAME) $(VQ)echo Creating $(PKGNAME) -$(PKGNAME): $(EXETARGET) +$(PKGNAME): $(EXETARGET) $(POSTEXES) $(Q)rm -rf $(HAIKU_TARGET_DIR) $(Q)rm -rf $(PKGNAME) $(Q)$(MKDIR) $(HAIKU_TARGET_DIR) diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile index 79e6fc493..31a7f4aea 100644 --- a/frontends/riscos/Makefile +++ b/frontends/riscos/Makefile @@ -174,7 +174,7 @@ install-riscos: package-riscos: netsurf.zip -netsurf.zip: $(EXETARGET) +netsurf.zip: $(EXETARGET) $(POSTEXES) $(eval $@_TMPDIR := $(shell mktemp -d)) $(Q) $(RM) $@ $(Q) cp -rLvp $(FRONTEND_SOURCE_DIR)/appdir $($@_TMPDIR)/!NetSurf diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile index 4e74edd7a..524f716fe 100644 --- a/frontends/windows/Makefile +++ b/frontends/windows/Makefile @@ -90,7 +90,7 @@ $(OBJROOT)/messages-en: $(MESSAGES_TARGET)/en/Messages $(VQ)echo " MSGCP: $< $@" $(Q)$(INSTALL) -m 644 -T $< $@ -netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ) +netsurf-installer.exe: $(EXETARGET) $(POSTEXES) $(WIN_RES_INS_OBJ) $(VQ)echo "MAKENSIS: $@" $(Q)makensis -V$(NSIS_VERBOSE) -NOCD -DOBJROOT=$(OBJROOT) -DRESDIR=$(FRONTEND_RESOURCES_DIR) -DVERSIONMAJOR=$(VERSION_MAJ) -DVERSIONMINOR=$(VERSION_MIN) -DOUTFNAME=$@ $(FRONTEND_RESOURCES_DIR)/installer.nsi -- cgit v1.2.1