diff options
| author |  Trevor Elliott <trevor@galois.com> | 2013-06-10 11:43:31 -0700 |
|---|---|---|
| committer | Trevor Elliott <trevor@galois.com> | 2013-06-10 11:43:31 -0700 |
| commit | ce457865b1c0f13e31bf1b48e796b7e95272c2cb (patch) | |
| tree | 9623a8a498b08a21854155468d2b123f227268c5 /src | |
| parent | f595a4885df795395d83ee68514eb1e1be8ebba4 (diff) | |
Put jquery ahead of simple libs, to not confuse old make
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/fiveui/build.mk | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/js/fiveui/build.mk b/src/js/fiveui/build.mk index aeb00a1..3cb1851 100644 --- a/src/js/fiveui/build.mk +++ b/src/js/fiveui/build.mk @@ -55,15 +55,6 @@ $2: $(patsubst $(fiveui-dir)/%,$1/data/%,$(wildcard $(fiveui-dir)/images/*)) # Libraries #################################################################### -# simple libraries -$1/data/%: $(lib-dir)/% | $1/data - $$(call cmd,cp) - -$2: $1/data/underscore.js \ - $1/data/backbone.js \ - $1/data/md5.js - - # jquery $1/data/jquery: | $1/data $$(call cmd,mkdir) @@ -79,6 +70,16 @@ $2: $1/data/jquery/jquery-1.8.3.js \ $1/data/jquery/bundled.css +# simple libraries +$1/data/%: $(lib-dir)/% | $1/data + $$(call cmd,cp) + +$2: $1/data/underscore.js \ + $1/data/backbone.js \ + $1/data/md5.js + + + # Other Files ################################################################## # top-level fiveui stuff |