aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Trevor Elliott <trevor@galois.com>2013-05-23 18:07:42 -0700
committerGravatar Trevor Elliott <trevor@galois.com>2013-05-23 18:07:42 -0700
commit0db7c6b6cb6326806e40c8139f27f6bf8507b03a (patch)
treeab5b44ad7b52af9afa5a0e3dd9251b984b1978a9
parentc36a7ca2312f970f8e8ccd2a993be456cfa6550c (diff)
Reorder dependencies to hopefully fix make 3.81
-rw-r--r--contexts/build.mk30
1 files changed, 14 insertions, 16 deletions
diff --git a/contexts/build.mk b/contexts/build.mk
index 2bbcc5c..94adfd6 100644
--- a/contexts/build.mk
+++ b/contexts/build.mk
@@ -19,23 +19,9 @@ bin-dir := $(data-dir)/target
# both plugins in a common tree. From this state, we can pick and choose what
# goes into each extension.
-stage-dir := $(build-dir)/stage
-
-$(stage-dir): | $(build-dir)
- $(call cmd,mkdir)
-
-$(stage-dir)/data: | $(stage-dir)
- $(call cmd,mkdir)
-
-$(stage-dir)/data/lib: | $(stage-dir)/data
- $(call cmd,mkdir)
-
+stage-dir := $(build-dir)/stage
target-dir := $(stage-dir)/data/target
-$(target-dir): | $(stage-dir)/data
- $(call cmd,mkdir)
-
-
define stage-files-from
$(stage-dir)/$1/$2: | $(stage-dir)/$1
$$(call cmd,mkdir)
@@ -44,7 +30,6 @@ $(stage-dir)/$1/$2/%: $(path)/$1/$2/% | $(stage-dir)/$1/$2
$$(call cmd,cp)
endef
-$(eval $(call stage-files-from,data,fiveui))
$(eval $(call stage-files-from,data/fiveui,images))
$(eval $(call stage-files-from,data/fiveui,chrome))
$(eval $(call stage-files-from,data/lib,codemirror))
@@ -52,6 +37,19 @@ $(eval $(call stage-files-from,data/lib,jquery))
$(eval $(call stage-files-from,data/lib,underscore))
$(eval $(call stage-files-from,data/lib,backbone))
+$(eval $(call stage-files-from,data,fiveui))
+$(eval $(call stage-files-from,data,lib))
+
+
+$(target-dir): | $(stage-dir)/data
+ $(call cmd,mkdir)
+
+$(stage-dir)/data: | $(stage-dir)
+ $(call cmd,mkdir)
+
+$(stage-dir): | $(build-dir)
+ $(call cmd,mkdir)
+
stage-path = $(patsubst $(path)/%,$(stage-dir)/%,$1)
stage-all = $(call stage-path,$(wildcard $(path)/$1/*))