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:
3b34460
)
fixt
author
ken
<ken@mihrtec.com>
Tue, 27 Sep 2016 03:20:16 +0000
(20:20 -0700)
committer
ken
<ken@mihrtec.com>
Tue, 27 Sep 2016 03:20:16 +0000
(20:20 -0700)
src/Makefile
patch
|
blob
|
history
diff --git
a/src/Makefile
b/src/Makefile
index
36f0e97
..
e718a01
100644
(file)
--- 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.
)
# 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
))
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))\
$(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)
# 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))))\
# 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))))
$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 $$@ $$^
.$(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
@echo Build Complete
# Rule to make any dirs that we're in charge of
-$(
MAKE_DIRS
):
+$(
sort $(MAKE_DIRS)
):
@mkdir -p $@
# Cleaning rules.
@mkdir -p $@
# Cleaning rules.