From 33f68265734ab46897aabe7ef8a089606c8a765a Mon Sep 17 00:00:00 2001 From: terminx Date: Tue, 2 Feb 2016 00:20:59 +0000 Subject: [PATCH] Renamed "veryclean" make recipe to "clean" and added veryclean back as an alias for compatibility. This also adds a suggestion to run "make clean" when linking fails. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@5598 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile | 5 ++--- polymer/eduke32/Makefile.common | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index a1fe5ec07..db1146974 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -742,7 +742,7 @@ $(ENGINE_OBJ) $(MACT_OBJ) $(AUDIOLIB_OBJ) $(ENET_OBJ) $(TESTGAME_OBJ) $(DUKE3D_O ## PHONIES -clean: cleanduke3d +veryclean: clean # Delete executables, object files created from sources in source/, and # miscellaneous generated files related to Lunatic on non-Linux. @@ -764,9 +764,8 @@ cleansw: cleanutils: -rm -f $(addsuffix $(EXESUFFIX),$(UTILS) $(GAMEUTILS)) $(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(UTILS))) $(addprefix $(DUKE3D_OBJ)/,$(addsuffix .$o,$(GAMEUTILS))) $(addsuffix $(EXESUFFIX),$(DXUTILS)) $(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(DXUTILS))) $(addsuffix $(EXESUFFIX),$(SDLUTILS)) $(addprefix $(ENGINE_OBJ)/,$(addsuffix .$o,$(SDLUTILS))) $(UTIL_OBJS_EXP) -veryclean: clean cleanutils +clean: cleanduke3d cleanutils ifeq ($(PRETTY_OUTPUT),1) - echo "Removed test game and utils objects." echo "rm -f $(ENGINE_OBJ)/*.$o $(MACT_OBJ)/*.$o $(AUDIOLIB_OBJ)/*.$o $(ENET_OBJ)/*.$o $(DUKE3D_RSRC)/*banner* $(EBACKTRACEDLL)" endif -rm -f $(ENGINE_OBJ)/*.$o $(MACT_OBJ)/*.$o $(AUDIOLIB_OBJ)/*.$o $(ENET_OBJ)/*.$o $(DUKE3D_RSRC)/*banner* $(EBACKTRACEDLL) diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common index 312e2e523..c9061aae1 100644 --- a/polymer/eduke32/Makefile.common +++ b/polymer/eduke32/Makefile.common @@ -1129,7 +1129,7 @@ ARCHIVE_FAILED = printf "\033[K\033[0;31mFailed creating library archive \033[1; RECIPE_RESULT_ARCHIVE = ; then $(ARCHIVE_OK); else $(ARCHIVE_FAILED); fi 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 +LINK_FAILED = printf "\033[K\033[0;31mFailed linking \033[1;31m$@\033[0;31m!\nIf the build options, environment, or system packages have changed, run \'\033[1;31mmake clean\033[0;31m\' and try again.\033[0m\n"; exit 1 RECIPE_RESULT_LINK = ; then $(LINK_OK); else $(LINK_FAILED); fi else RECIPE_IF =