aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBenoit Germain <benoit.germain@ubisoft.com>2024-04-11 15:56:04 +0200
committerBenoit Germain <benoit.germain@ubisoft.com>2024-04-11 15:56:04 +0200
commit00970610dc8fbd00a11d3b69e4702933a592ce9f (patch)
treec746e91de27fe7ce036242e4667074b4597b77dd /Makefile
parent21e881fd6c085e615c438ceb6eb438712f5c5075 (diff)
parentadaa36dbec1ce9aaafd61873b9d3d898a8c240cf (diff)
downloadlanes-00970610dc8fbd00a11d3b69e4702933a592ce9f.tar.gz
lanes-00970610dc8fbd00a11d3b69e4702933a592ce9f.tar.bz2
lanes-00970610dc8fbd00a11d3b69e4702933a592ce9f.zip
Merge branch 'C-Implementation'
Since almost everything in C-implementation comes from manual cherry-picking stuff in master, the merge essentially consist in a pure git tree operation to reconnect stuff properly.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 0750401..32f39ba 100644
--- a/Makefile
+++ b/Makefile
@@ -81,8 +81,8 @@ test:
81 $(MAKE) fibonacci 81 $(MAKE) fibonacci
82 $(MAKE) fifo 82 $(MAKE) fifo
83 $(MAKE) func_is_string 83 $(MAKE) func_is_string
84 $(MAKE) irayo_recursive
85 $(MAKE) irayo_closure 84 $(MAKE) irayo_closure
85 $(MAKE) irayo_recursive
86 $(MAKE) keeper 86 $(MAKE) keeper
87 $(MAKE) linda_perf 87 $(MAKE) linda_perf
88 $(MAKE) objects 88 $(MAKE) objects
@@ -104,8 +104,8 @@ cancel: tests/cancel.lua $(_TARGET_SO)
104REP_ARGS=-llanes -e "print'say aaa'; for i=1,10 do print(i) end" 104REP_ARGS=-llanes -e "print'say aaa'; for i=1,10 do print(i) end"
105repetitive: $(_TARGET_SO) 105repetitive: $(_TARGET_SO)
106 for i in 1 2 3 4 5 6 7 8 9 10 a b c d e f g h i j k l m n o p q r s t u v w x y z; \ 106 for i in 1 2 3 4 5 6 7 8 9 10 a b c d e f g h i j k l m n o p q r s t u v w x y z; \
107 do $(_PREFIX) $(LUA) $(REP_ARGS); \ 107 do $(_PREFIX) $(LUA) $(REP_ARGS); \
108 done 108 done
109 109
110repetitive1: $(_TARGET_SO) 110repetitive1: $(_TARGET_SO)
111 $(_PREFIX) $(LUA) $(REP_ARGS) 111 $(_PREFIX) $(LUA) $(REP_ARGS)
@@ -236,9 +236,9 @@ else
236 -rm -rf $(MODULE)-$(VERSION) 236 -rm -rf $(MODULE)-$(VERSION)
237 mkdir $(MODULE)-$(VERSION) 237 mkdir $(MODULE)-$(VERSION)
238 tar c * --exclude=.svn --exclude=.DS_Store --exclude="_*" \ 238 tar c * --exclude=.svn --exclude=.DS_Store --exclude="_*" \
239 --exclude="*.tgz" --exclude="*.rockspec" \ 239 --exclude="*.tgz" --exclude="*.rockspec" \
240 --exclude=lanes.dev --exclude="$(MODULE)-*" --exclude=xcode \ 240 --exclude=lanes.dev --exclude="$(MODULE)-*" --exclude=xcode \
241 --exclude="*.obj" --exclude="*.dll" --exclude=timeit.dat \ 241 --exclude="*.obj" --exclude="*.dll" --exclude=timeit.dat \
242 | (cd $(MODULE)-$(VERSION) && tar x) 242 | (cd $(MODULE)-$(VERSION) && tar x)
243 tar czvf $(MODULE)-$(VERSION).tgz $(MODULE)-$(VERSION) 243 tar czvf $(MODULE)-$(VERSION).tgz $(MODULE)-$(VERSION)
244 rm -rf $(MODULE)-$(VERSION) 244 rm -rf $(MODULE)-$(VERSION)