From 9a56b99f2744abd2fbd3e86ca5895bf97eedae50 Mon Sep 17 00:00:00 2001 From: rexy712 Date: Mon, 19 Apr 2021 12:49:51 -0700 Subject: [PATCH] Fix basic makefile using unspecified behavior --- makefile.basic | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/makefile.basic b/makefile.basic index badf80d..280cc1f 100644 --- a/makefile.basic +++ b/makefile.basic @@ -11,7 +11,7 @@ #You should have received a copy of the GNU General Public License #along with this program. If not, see . -#Copyright 2018-2020 rexy712 +#Copyright 2018-2021 rexy712 #Makefile to generate a single executable from all sources in SOURCE_DIRS that end in EXT @@ -72,7 +72,7 @@ endif #windows all:: #main target -all:: | flags-update $(MAIN_EXECUTABLE) +all:: $(MAIN_EXECUTABLE) #postrun targets all:: @@ -162,25 +162,23 @@ define \n endef -.PHONY: cflags-update -cflags-update: ifeq ($(SAVEFLAGS),1) -ifneq ($(subst -MF"$(DEPDIR)/",-MF"$(DEPDIR)/cflags-update",$(ALL_COMPILEFLAGS)),$(OLD_COMPILEFLAGS)) +ifneq ($(subst -MF"$(DEPDIR)/",-MF"$(DEPDIR)/$(CFLAGS_TMPFILE)",$(ALL_COMPILEFLAGS)),$(OLD_COMPILEFLAGS)) +.PHONY: $(CFLAGS_TMPFILE) +$(CFLAGS_TMPFILE): $(file >$(CFLAGS_TMPFILE),$(ALL_COMPILEFLAGS)) -endif -$(CFLAGS_TMPFILE): cflags-update -endif -.PHONY: ldflags-update -ldflags-update: -ifeq ($(SAVEFLAGS),1) -ifneq ($(ALL_LINKFLAGS),$(OLD_LINKFLAGS)) - $(file >$(LDFLAGS_TMPFILE),$(ALL_LINKFLAGS)) -endif -$(LDFLAGS_TMPFILE): ldflags-update +else +$(CFLAGS_TMPFILE): endif -.PHONY: flags-update -flags-update: cflags-update ldflags-update +ifneq ($(ALL_LINKFLAGS),$(OLD_LINKFLAGS)) +.PHONY: $(LDFLAGS_TMPFILE) +$(LDFLAGS_TMPFILE): + $(file >$(LDFLAGS_TMPFILE),$(ALL_LINKFLAGS)) +else +$(LDFLAGS_TMPFILE): +endif +endif #Link executable $(MAIN_EXECUTABLE): $(OBJECTS) $(LDFLAGS_TMPFILE)