projects
/
henge
/
webcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
795958c
)
fixt
author
ken
<ken@mihrtec.com>
Fri, 14 Oct 2016 01:21:50 +0000
(18:21 -0700)
committer
ken
<ken@mihrtec.com>
Fri, 14 Oct 2016 01:21:50 +0000
(18:21 -0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
504d0bb
..
01aa4ab
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-194,7
+194,7
@@
endef
define SRC_LANG_RULE =
$(if $($1),,$(eval $1 := t)\
$(eval MOD := $(filter $(MODULES),$(firstword $(subst /, ,$(subst $(SRC_DIR),,$(dir $1))))))\
define SRC_LANG_RULE =
$(if $($1),,$(eval $1 := t)\
$(eval MOD := $(filter $(MODULES),$(firstword $(subst /, ,$(subst $(SRC_DIR),,$(dir $1))))))\
-$(eval FLG := $(MOD:%=-I% ))\
+$(eval FLG := $(MOD:%=-I
$(SRC_DIR)/
% ))\
$(if $(wildcard $1),
$(eval DEPS := $(filter-out \ %:,$(shell $($2_C) $(FLG) -M -MG $1)))\
$(eval DDEPS := $(filter $(DRIVER_DIR:$(SRC_DIR)/%=%/%),$(DEPS)))\
$(if $(wildcard $1),
$(eval DEPS := $(filter-out \ %:,$(shell $($2_C) $(FLG) -M -MG $1)))\
$(eval DDEPS := $(filter $(DRIVER_DIR:$(SRC_DIR)/%=%/%),$(DEPS)))\
@@
-329,7
+329,7
@@
endef
# a single locally-linked (no external -L libs) object (for simplified linking
# modules as static libs).#######################################################
define MODULE_ARCRULE =
# a single locally-linked (no external -L libs) object (for simplified linking
# modules as static libs).#######################################################
define MODULE_ARCRULE =
-$(eval ARCDEPS := $(filter $1/%.$(c_OBJ),$(foreach lang,$(LANGS),$($(lang)_MOD_TRG))))\
+$(eval ARCDEPS := $(filter $
(SRC_DIR)/$
1/%.$(c_OBJ),$(foreach lang,$(LANGS),$($(lang)_MOD_TRG))))\
$(eval MAKE_TARGETS+= $1.$(c_AROBJ))\
$(SRC_DIR)/$1.$(c_AROBJ): $(ARCDEPS)
$(eval MAKE_TARGETS+= $1.$(c_AROBJ))\
$(SRC_DIR)/$1.$(c_AROBJ): $(ARCDEPS)