diff options
author | Mark Pulford <mark@kyne.com.au> | 2011-12-08 20:57:12 +1030 |
---|---|---|
committer | Mark Pulford <mark@kyne.com.au> | 2011-12-08 20:57:12 +1030 |
commit | bd994cd7976ac93c530792e3c0d6f45a33c757b4 (patch) | |
tree | 6e5a4dd5d1b01e71d66f3cfe3d8e8c39d1410480 /runtests.sh | |
parent | bea23facc1644cffa53ecc84fa236806e9c94dfd (diff) | |
download | lua-cjson-bd994cd7976ac93c530792e3c0d6f45a33c757b4.tar.gz lua-cjson-bd994cd7976ac93c530792e3c0d6f45a33c757b4.tar.bz2 lua-cjson-bd994cd7976ac93c530792e3c0d6f45a33c757b4.zip |
Fix Makefile for use with non-GNU make
- Remove GNU make "override" statements.
- Add OBJS variable since there is no portable way to specify all
targets for linking.
Also:
- Put build defaults at the top to avoid potential confusion.
- Don't assume a Linux platform. Default to USE_POSIX_SETLOCALE.
- Change "install -d" to mkdir/install since the former isn't
available on some platforms (Solaris).
Diffstat (limited to 'runtests.sh')
-rwxr-xr-x | runtests.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/runtests.sh b/runtests.sh index 1e0a5cd..ed78cc5 100755 --- a/runtests.sh +++ b/runtests.sh | |||
@@ -1,8 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | MAKE=make | ||
4 | #MAKE=gmake | ||
5 | |||
6 | EGREP="grep -E" | 3 | EGREP="grep -E" |
7 | #EGREP="egrep" | 4 | #EGREP="egrep" |
8 | 5 | ||
@@ -28,18 +25,18 @@ echo "===== Building UTF-8 test data =====" | |||
28 | ( cd tests && ./genutf8.pl; ) | 25 | ( cd tests && ./genutf8.pl; ) |
29 | 26 | ||
30 | echo "===== Cleaning old build data =====" | 27 | echo "===== Cleaning old build data =====" |
31 | $MAKE clean | 28 | make clean |
32 | rm -f tests/cjson.so | 29 | rm -f tests/cjson.so |
33 | 30 | ||
34 | echo "===== Testing LuaRocks build =====" | 31 | echo "===== Testing LuaRocks build =====" |
35 | luarocks make --local | 32 | luarocks make --local |
36 | do_tests | 33 | do_tests |
37 | luarocks remove --local lua-cjson | 34 | luarocks remove --local lua-cjson |
38 | $MAKE clean | 35 | make clean |
39 | 36 | ||
40 | echo "===== Testing Makefile build =====" | 37 | echo "===== Testing Makefile build =====" |
41 | $MAKE | 38 | make |
42 | cp cjson.so tests | 39 | cp cjson.so tests |
43 | do_tests | 40 | do_tests |
44 | $MAKE clean | 41 | make clean |
45 | rm -f tests/cjson.so | 42 | rm -f tests/cjson.so |