diff options
| author | Mark Pulford <mark@kyne.com.au> | 2012-02-18 18:58:17 +0400 |
|---|---|---|
| committer | Mark Pulford <mark@kyne.com.au> | 2012-03-04 12:24:36 +0400 |
| commit | 6a8c434e38f3035d04bf17696353cf0bb93abec6 (patch) | |
| tree | b8f809598f6d32a6d371225e3fe7e995a54abe89 | |
| parent | ee9c0d1aa474214f3bc638b6ef88aba66a7f0b67 (diff) | |
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 #CJSON_LDFLAGS = -bundle -undefined dynamic_lookup ## Solaris +#CC = gcc #CJSON_CFLAGS = -fpic -DUSE_INTERNAL_ISINF ## Windows (MinGW) @@ -49,9 +50,12 @@ LUA_BIN_DIR = $(PREFIX)/bin #CJSON_LDFLAGS = -shared -L$(PREFIX)/lib -llua51 #LUA_BIN_SUFFIX = .lua -##### Use built in number conversion (optional) ##### +##### Number conversion configuration ##### -## Enable built in number conversion +## Use Libc support for number conversion (default) +FPCONV_OBJS = fpconv.o + +## Use built in number conversion #FPCONV_OBJS = g_fmt.o dtoa.o #CJSON_CFLAGS += -DUSE_INTERNAL_FPCONV @@ -72,11 +76,10 @@ TEST_FILES = README bench.lua genutf8.pl test.lua octets-escaped.dat \ DATAPERM = 644 EXECPERM = 755 -ASCIIDOC ?= asciidoc +ASCIIDOC = asciidoc BUILD_CFLAGS = -I$(LUA_INCLUDE_DIR) $(CJSON_CFLAGS) -FPCONV_OBJS ?= fpconv.o -OBJS := lua_cjson.o strbuf.o $(FPCONV_OBJS) +OBJS = lua_cjson.o strbuf.o $(FPCONV_OBJS) .PHONY: all clean install install-extra doc |