From babade44ea7ac6711a5635530f3e28ed34dc2789 Mon Sep 17 00:00:00 2001 From: ken Date: Thu, 13 Oct 2016 19:58:26 -0700 Subject: [PATCH] archive double inclusion fix, archives in clean rule fix --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 01aa4ab..abcd469 100644 --- a/Makefile +++ b/Makefile @@ -258,7 +258,7 @@ $(eval DRIVER_MODULES := $(filter-out $(DRIVER_DIR) . ..,$(sort $(DRIVER_MODULES $(eval DRIVER_LDVALS := $(file <$(1:%.$2=%.ld))) $(eval DRIVER_LFLAGS := $(filter -l%,$(DRIVER_LDVALS))) $(eval DRIVER_MODULES += $(filter-out -l%,$(DRIVER_LDVALS))) - +$(eval DRIVER_MODULES := $(sort $(DRIVER_MODULES))) # List of module archives to link together during compilation $(eval DRIVER_ARCHIVES := $(DRIVER_MODULES:%=$(SRC_DIR)/%.$($2_AROBJ))) $(eval DRIVER_DEPS := $(DRIVER_SOB) $(DRIVER_ARCHIVES)) @@ -330,7 +330,7 @@ endef # modules as static libs).####################################################### define MODULE_ARCRULE = $(eval ARCDEPS := $(filter $(SRC_DIR)/$1/%.$(c_OBJ),$(foreach lang,$(LANGS),$($(lang)_MOD_TRG))))\ -$(eval MAKE_TARGETS+= $1.$(c_AROBJ))\ +$(eval MAKE_TARGETS+= $(SRC_DIR)/$1.$(c_AROBJ))\ $(SRC_DIR)/$1.$(c_AROBJ): $(ARCDEPS) $(c_AR) cr $$@ $$^ -- 2.18.0