projects
/
henge
/
webcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
fbaf240
)
archive double inclusion fix, archives in clean rule fix
author
ken
<ken@mihrtec.com>
Fri, 14 Oct 2016 02:58:26 +0000
(19:58 -0700)
committer
ken
<ken@mihrtec.com>
Fri, 14 Oct 2016 02:58:26 +0000
(19:58 -0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
01aa4ab
..
abcd469
100644
(file)
--- 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_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))
# 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))))\
# 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 $$@ $$^
$(SRC_DIR)/$1.$(c_AROBJ): $(ARCDEPS)
$(c_AR) cr $$@ $$^