diff options
author | Mark Pulford <mark@kyne.com.au> | 2012-02-19 01:28:17 +1030 |
---|---|---|
committer | Mark Pulford <mark@kyne.com.au> | 2012-03-04 18:54:36 +1030 |
commit | 6a8c434e38f3035d04bf17696353cf0bb93abec6 (patch) | |
tree | b8f809598f6d32a6d371225e3fe7e995a54abe89 | |
parent | ee9c0d1aa474214f3bc638b6ef88aba66a7f0b67 (diff) | |
download | lua-cjson-6a8c434e38f3035d04bf17696353cf0bb93abec6.tar.gz lua-cjson-6a8c434e38f3035d04bf17696353cf0bb93abec6.tar.bz2 lua-cjson-6a8c434e38f3035d04bf17696353cf0bb93abec6.zip |
Work around Solaris make limitations
Remove ?= and := assignment operators from the Makefile since
they are not supported by Solaris make.
-rw-r--r-- | Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -40,6 +40,7 @@ LUA_BIN_DIR = $(PREFIX)/bin | |||
40 | #CJSON_LDFLAGS = -bundle -undefined dynamic_lookup | 40 | #CJSON_LDFLAGS = -bundle -undefined dynamic_lookup |
41 | 41 | ||
42 | ## Solaris | 42 | ## Solaris |
43 | #CC = gcc | ||
43 | #CJSON_CFLAGS = -fpic -DUSE_INTERNAL_ISINF | 44 | #CJSON_CFLAGS = -fpic -DUSE_INTERNAL_ISINF |
44 | 45 | ||
45 | ## Windows (MinGW) | 46 | ## Windows (MinGW) |
@@ -49,9 +50,12 @@ LUA_BIN_DIR = $(PREFIX)/bin | |||
49 | #CJSON_LDFLAGS = -shared -L$(PREFIX)/lib -llua51 | 50 | #CJSON_LDFLAGS = -shared -L$(PREFIX)/lib -llua51 |
50 | #LUA_BIN_SUFFIX = .lua | 51 | #LUA_BIN_SUFFIX = .lua |
51 | 52 | ||
52 | ##### Use built in number conversion (optional) ##### | 53 | ##### Number conversion configuration ##### |
53 | 54 | ||
54 | ## Enable built in number conversion | 55 | ## Use Libc support for number conversion (default) |
56 | FPCONV_OBJS = fpconv.o | ||
57 | |||
58 | ## Use built in number conversion | ||
55 | #FPCONV_OBJS = g_fmt.o dtoa.o | 59 | #FPCONV_OBJS = g_fmt.o dtoa.o |
56 | #CJSON_CFLAGS += -DUSE_INTERNAL_FPCONV | 60 | #CJSON_CFLAGS += -DUSE_INTERNAL_FPCONV |
57 | 61 | ||
@@ -72,11 +76,10 @@ TEST_FILES = README bench.lua genutf8.pl test.lua octets-escaped.dat \ | |||
72 | DATAPERM = 644 | 76 | DATAPERM = 644 |
73 | EXECPERM = 755 | 77 | EXECPERM = 755 |
74 | 78 | ||
75 | ASCIIDOC ?= asciidoc | 79 | ASCIIDOC = asciidoc |
76 | 80 | ||
77 | BUILD_CFLAGS = -I$(LUA_INCLUDE_DIR) $(CJSON_CFLAGS) | 81 | BUILD_CFLAGS = -I$(LUA_INCLUDE_DIR) $(CJSON_CFLAGS) |
78 | FPCONV_OBJS ?= fpconv.o | 82 | OBJS = lua_cjson.o strbuf.o $(FPCONV_OBJS) |
79 | OBJS := lua_cjson.o strbuf.o $(FPCONV_OBJS) | ||
80 | 83 | ||
81 | .PHONY: all clean install install-extra doc | 84 | .PHONY: all clean install install-extra doc |
82 | 85 | ||