From 4fe25690e7da3642fd12a99c6e616bd4f183bc5b Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 8 Jul 2015 03:34:34 +0000
Subject: [PATCH] Makefile tweaks: remove BUILD_FINISHED because it frequently
 appeared in the wrong place when using make -j, and remove "executable"
 wording from linking phase. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@5279 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile        | 11 ++++-------
 polymer/eduke32/Makefile.common | 14 ++++++--------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index 2d3b5ee1d..b7801eefb 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -403,7 +403,7 @@ endif
 
 all: duke3d
 
-duke3d: start $(EDUKE32_TARGET) $(MAPSTER32_TARGET) finish
+duke3d: start $(EDUKE32_TARGET) $(MAPSTER32_TARGET) 
 ifneq (,$(EDUKE32_TARGET))
 	@ls -l $(EDUKE32)$(EXESUFFIX)
 endif
@@ -411,7 +411,7 @@ ifneq (,$(MAPSTER32_TARGET))
 	@ls -l $(MAPSTER32)$(EXESUFFIX)
 endif
 
-test: start $(TESTGAME_TARGET) $(TESTEDITOR_TARGET) finish
+test: start $(TESTGAME_TARGET) $(TESTEDITOR_TARGET) 
 ifneq (,$(TESTGAME_TARGET))
 	@ls -l $(TESTGAME)$(EXESUFFIX)
 endif
@@ -419,7 +419,7 @@ ifneq (,$(TESTEDITOR_TARGET))
 	@ls -l $(TESTEDITOR)$(EXESUFFIX)
 endif
 
-sw: start $(SW_TARGET) $(SW_EDITOR_TARGET) finish
+sw: start $(SW_TARGET) $(SW_EDITOR_TARGET) 
 ifneq (,$(SW_TARGET))
 	@ls -l $(SW)$(EXESUFFIX)
 endif
@@ -427,7 +427,7 @@ ifneq (,$(SW_EDITOR_TARGET))
 	@ls -l $(SW_EDITOR)$(EXESUFFIX)
 endif
 
-ebacktrace: start $(EBACKTRACEDLL_TARGET) finish
+ebacktrace: start $(EBACKTRACEDLL_TARGET) 
 ifneq (,$(EBACKTRACEDLL_TARGET))
 	@ls -l $(EBACKTRACEDLL)
 endif
@@ -435,9 +435,6 @@ endif
 start:
 	$(BUILD_STARTED)
 
-finish:
-	$(BUILD_FINISHED)
-
 utils: $(addsuffix $(EXESUFFIX),$(UTILS) $(GAMEUTILS))
 	@ls -l $^
 
diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index f85dd75f2..3964c8a33 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -1092,28 +1092,26 @@ else
 endif
 BUILD_STARTED = printf "\033[K\033[1;36mBuild started using:\033[0m\n"; $(BUILD_SETTINGS)
 BUILD_ECHOFLAGS = printf "\033[K\033[1;36mEnded compilation in this directory using:\n$(BUILD_SETTINGS_COMPILER)\033[0m\n"
-BUILD_FINISHED = printf "\033[K\033[1;36mBuild successful:\033[0m\n"
 COMPILE_STATUS = printf "\033[K\033[0mBuilding object \033[1m$@\033[0m...\033[0m\r"
 COMPILE_OK = printf "\033[K\033[0;32mBuilt object \033[1;32m$@\033[0;32m \033[0m\n"
 COMPILE_FAILED = printf "\033[K\033[0;31mFailed building \033[1;31m$@\033[0;31m from\033[0m \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1
 RECIPE_RESULT_COMPILE = ; then $(COMPILE_OK); else $(COMPILE_FAILED); fi
-ONESTEP_STATUS = printf "\033[K\033[0mBuilding executable \033[1m$@\033[0m...\033[0m\r"
-ONESTEP_OK = printf "\033[K\033[0;32mBuilt executable \033[1;32m$@\033[0;32m \033[0m\n"
-ONESTEP_FAILED = printf "\033[K\033[0;31mFailed building executable \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1
+ONESTEP_STATUS = printf "\033[K\033[0mBuilding \033[1m$@\033[0m...\033[0m\r"
+ONESTEP_OK = printf "\033[K\033[0;32mBuilt \033[1;32m$@\033[0;32m \033[0m\n"
+ONESTEP_FAILED = printf "\033[K\033[0;31mFailed building \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1
 RECIPE_RESULT_ONESTEP = ; then $(ONESTEP_OK); else $(ONESTEP_FAILED); fi
 ARCHIVE_STATUS = printf "\033[K\033[0mCreating library archive \033[1m$@\033[0m...\033[0m\r"
 ARCHIVE_OK = printf "\033[K\033[0;32mCreated library archive \033[1;32m$@\033[0;32m \033[0m\n"
 ARCHIVE_FAILED = printf "\033[K\033[0;31mFailed creating library archive \033[1;31m$@\033[0;31m from\033[0m \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1
 RECIPE_RESULT_ARCHIVE = ; then $(ARCHIVE_OK); else $(ARCHIVE_FAILED); fi
-LINK_STATUS = printf "\033[K\033[0;0mLinking executable \033[1m$@\033[0;0m...\033[0m\r"
-LINK_OK = printf "\033[K\033[0;32mLinked executable \033[1;32m$@\033[0;32m \033[0m\n"
-LINK_FAILED = printf "\033[K\033[0;31mFailed linking executable \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1
+LINK_STATUS = printf "\033[K\033[0;0mLinking \033[1m$@\033[0;0m...\033[0m\r"
+LINK_OK = printf "\033[K\033[0;32mLinked \033[1;32m$@\033[0;32m \033[0m\n"
+LINK_FAILED = printf "\033[K\033[0;31mFailed linking \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1
 RECIPE_RESULT_LINK = ; then $(LINK_OK); else $(LINK_FAILED); fi
 else
 RECIPE_IF =
 BUILD_STARTED =
 BUILD_ECHOFLAGS =
-BUILD_FINISHED =
 COMPILE_STATUS =
 COMPILE_OK = true
 COMPILE_FAILED = false; exit 1