aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Pulford <mark@kyne.com.au>2012-01-02 18:15:40 +1030
committerMark Pulford <mark@kyne.com.au>2012-01-02 18:15:40 +1030
commit3577e3548471da045a5198d2a9a64eba5383d8da (patch)
tree476d89cbd0bc6e865fbee972955f513152daae4a
parent2c9468f62b51f0fa32c9c79f6195f9df755be576 (diff)
downloadlua-cjson-3577e3548471da045a5198d2a9a64eba5383d8da.tar.gz
lua-cjson-3577e3548471da045a5198d2a9a64eba5383d8da.tar.bz2
lua-cjson-3577e3548471da045a5198d2a9a64eba5383d8da.zip
Tidy Makefile sections and comments
-rw-r--r--Makefile33
1 files changed, 16 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 1d389b2..57f2e1b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,12 @@
1LUA_VERSION = 5.1 1##### Available defines for CJSON_CFLAGS #####
2 2##
3## Available defines for CJSON_CFLAGS 3## USE_INTERNAL_ISINF: Workaround for Solaris platforms missing isinf().
4# 4## DISABLE_CJSON_GLOBAL: Do not store module is "cjson" global.
5# USE_INTERNAL_ISINF: Workaround for Solaris platforms missing isinf(). 5## DISABLE_INVALID_NUMBERS: Permanently disable invalid JSON numbers:
6# DISABLE_CJSON_GLOBAL: Do not store module is "cjson" global. 6## NaN, Infinity, hex.
7# DISABLE_INVALID_NUMBERS: Permanently disable invalid JSON numbers: 7
8# - NaN, Infinity, hex. 8##### Build defaults #####
9 9LUA_VERSION = 5.1
10## Build defaults
11TARGET = cjson.so 10TARGET = cjson.so
12PREFIX = /usr/local 11PREFIX = /usr/local
13#CFLAGS = -g -Wall -pedantic -fno-inline 12#CFLAGS = -g -Wall -pedantic -fno-inline
@@ -18,12 +17,12 @@ LUA_INCLUDE_DIR = $(PREFIX)/include
18LUA_MODULE_DIR = $(PREFIX)/lib/lua/$(LUA_VERSION) 17LUA_MODULE_DIR = $(PREFIX)/lib/lua/$(LUA_VERSION)
19INSTALL_CMD = install 18INSTALL_CMD = install
20 19
21## Platform overrides 20##### Platform overrides #####
22# 21##
23# Tweak one of the platform sections below to suit your situation. 22## Tweak one of the platform sections below to suit your situation.
24# 23##
25# See http://lua-users.org/wiki/BuildingModules for further platform 24## See http://lua-users.org/wiki/BuildingModules for further platform
26# specific details. 25## specific details.
27 26
28## Linux 27## Linux
29 28
@@ -43,7 +42,7 @@ INSTALL_CMD = install
43#CJSON_CFLAGS = -DDISABLE_INVALID_NUMBERS 42#CJSON_CFLAGS = -DDISABLE_INVALID_NUMBERS
44#CJSON_LDFLAGS = -shared -L$(PREFIX)/lib -llua51 43#CJSON_LDFLAGS = -shared -L$(PREFIX)/lib -llua51
45 44
46## End platform specific section 45##### End customisable sections #####
47 46
48BUILD_CFLAGS = -I$(LUA_INCLUDE_DIR) $(CJSON_CFLAGS) 47BUILD_CFLAGS = -I$(LUA_INCLUDE_DIR) $(CJSON_CFLAGS)
49OBJS := lua_cjson.o strbuf.o fpconv.o 48OBJS := lua_cjson.o strbuf.o fpconv.o