From 24e03a8d3a3d4d8a4ab5208709429454545f6d44 Mon Sep 17 00:00:00 2001 From: ken Date: Mon, 26 Sep 2016 20:20:16 -0700 Subject: [PATCH] fixt --- src/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Makefile b/src/Makefile index 36f0e97..e718a01 100644 --- a/src/Makefile +++ b/src/Makefile @@ -137,7 +137,7 @@ $(info $(SHELL_CMD) $(shell $(SHELL_CMD))) ) # Put these targets on the MAKE_TARGETS list to be removed during "clean", # regardless of whether or not they were built just now. -$(info MAKE_TARGETS+= $(SLANG_TRG)) +$(eval MAKE_TARGETS+= $(SLANG_TRG)) )) endef # Compile a source language to a language that compiles to binary, but only if @@ -177,7 +177,7 @@ $(eval MDEPS := $(shell echo $(MDEPS) | sed -e 's@[a-zA-Z0-9\-\+/]*\.\./include@ $(eval ALLDEPS := $(MDEPS) $(DEPS)),\ $(error Cannot generate deps for: $1, file not found))\ $(eval SRC_OBJ := $(basename $1).$($2_OBJ))\ -$(info MAKE_TARGETS+= $(SRC_OBJ))\ +$(eval MAKE_TARGETS+= $(SRC_OBJ))\ # Object for $1 $(SRC_OBJ): $(ALLDEPS) @@ -285,13 +285,14 @@ endef # modules as static libs). define MODULE_ARCRULE = $(eval ARCDEPS := $(filter $1/%.$(c_OBJ),$(foreach lang,$(LANGS),$($(lang)_MOD_TRG))))\ -$(info MAKE_TARGETS+= $1.$(c_AROBJ))\ +$(eval MAKE_TARGETS+= $1.$(c_AROBJ))\ + $1.$(c_AROBJ): $(ARCDEPS) $(c_AR) cr $$@ $$^ $(if $(c_DBG), $(eval undefine DBGARCDEPS) $(foreach arcdep,$(ARCDEPS),$(eval DBGARCDEPS += $(dir $(arcdep)).$(c_DBG)/$(notdir $(arcdep)))) -$(info MAKE_TARGETS+= .$(c_DBG)/$1.$(c_AROBJ))\ +$(eval MAKE_TARGETS+= .$(c_DBG)/$1.$(c_AROBJ))\ .$(c_DBG)/$1.$(c_AROBJ): $(DBGARCDEPS) | .$(c_DBG)/ $(c_AR) cr $$@ $$^ @@ -519,7 +520,7 @@ all: $(basename $(DRV_FNAMES)) @echo Build Complete # Rule to make any dirs that we're in charge of -$(MAKE_DIRS): +$(sort $(MAKE_DIRS)): @mkdir -p $@ # Cleaning rules. -- 2.18.0