From: ken <ken@mihrtec.com>
Date: Fri, 14 Oct 2016 02:58:26 +0000 (-0700)
Subject: archive double inclusion fix, archives in clean rule fix
X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=commitdiff_plain;h=babade44ea7ac6711a5635530f3e28ed34dc2789

archive double inclusion fix, archives in clean rule fix
---

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 $$@ $$^