Skip to content

Commit 8bd7dc2

Browse files
committed
more misc makefile changes
1 parent 1a68425 commit 8bd7dc2

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ LUAROCKS = luarocks --lua-version=$(LUA_VERSION)
44
LUA_PATH_MAKE = $(shell $(LUAROCKS) path --lr-path);./?.lua;./?/init.lua
55
LUA_CPATH_MAKE = $(shell $(LUAROCKS) path --lr-cpath);./?.so
66

7-
.PHONY: test local compile compile_system watch lint count show
7+
.PHONY: test local build watch lint count show
88

9-
test:
10-
busted
9+
build:
10+
LUA_PATH='$(LUA_PATH_MAKE)' LUA_CPATH='$(LUA_CPATH_MAKE)' $(LUA) bin/moonc moon/ moonscript/
11+
echo "#!/usr/bin/env lua" > bin/moon
12+
$(LUA) bin/moonc -p bin/moon.moon >> bin/moon
13+
echo "-- vim: set filetype=lua:" >> bin/moon
1114

1215
show:
1316
# LUA $(LUA)
@@ -16,14 +19,11 @@ show:
1619
# LUA_PATH_MAKE $(LUA_PATH_MAKE)
1720
# LUA_CPATH_MAKE $(LUA_CPATH_MAKE)
1821

19-
local: compile
20-
LUA_PATH='$(LUA_PATH_MAKE)' LUA_CPATH='$(LUA_CPATH_MAKE)' $(LUAROCKS) make --local moonscript-dev-1.rockspec
22+
test: build
23+
busted
2124

22-
compile:
23-
LUA_PATH='$(LUA_PATH_MAKE)' LUA_CPATH='$(LUA_CPATH_MAKE)' $(LUA) bin/moonc moon/ moonscript/
24-
echo "#!/usr/bin/env lua" > bin/moon
25-
$(LUA) bin/moonc -p bin/moon.moon >> bin/moon
26-
echo "-- vim: set filetype=lua:" >> bin/moon
25+
local: build
26+
LUA_PATH='$(LUA_PATH_MAKE)' LUA_CPATH='$(LUA_CPATH_MAKE)' $(LUAROCKS) make --local moonscript-dev-1.rockspec
2727

2828
watch:
2929
moonc moon/ moonscript/ && moonc -w moon/ moonscript/

0 commit comments

Comments
 (0)