HCoop
/
jackhill
/
mal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
78261ad
)
Makefile: fix recursive make of compiled impls.
author
Joel Martin
<github@martintribe.org>
Wed, 18 Nov 2015 22:32:53 +0000
(16:32 -0600)
committer
Joel Martin
<github@martintribe.org>
Wed, 18 Nov 2015 22:32:53 +0000
(16:32 -0600)
Should fix #105
Makefile
patch
|
blob
|
blame
|
history
diff --git
a/Makefile
b/Makefile
index
bf231db
..
69dc20c
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-186,8
+186,12
@@
IMPL_PERF = $(filter-out $(EXCLUDE_PERFS),$(foreach impl,$(DO_IMPLS),perf^$(impl
#
# Build a program in an implementation directory
#
# Build a program in an implementation directory
+# Make sure we always try and build first because the dependencies are
+# encoded in the implementation Makefile not here
+.PHONY: $(foreach i,$(DO_IMPLS),$(foreach s,$(STEPS),$(call $(i)_STEP_TO_PROG,$(s))))
$(foreach i,$(DO_IMPLS),$(foreach s,$(STEPS),$(call $(i)_STEP_TO_PROG,$(s)))):
$(foreach i,$(DO_IMPLS),$(foreach s,$(STEPS),$(call $(i)_STEP_TO_PROG,$(s)))):
- $(MAKE) -C $(dir $(@)) $(notdir $(@))
+ $(foreach impl,$(word 1,$(subst /, ,$(@))),\
+ $(MAKE) -C $(impl) $(subst $(impl)/,,$(@)))
# Allow test, test^STEP, test^IMPL, and test^IMPL^STEP
.SECONDEXPANSION:
# Allow test, test^STEP, test^IMPL, and test^IMPL^STEP
.SECONDEXPANSION: