aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMark Pulford <mark@kyne.com.au>2012-01-20 08:17:40 +1030
committerMark Pulford <mark@kyne.com.au>2012-03-04 18:54:35 +1030
commit1582c219f55f3938d56fc5ca2cc0bb2286630f03 (patch)
tree514eae2c66474e530676bf3998f282dfbfa853d1 /Makefile
parent43be08bd32d244250eecc1d006a162651a173148 (diff)
downloadlua-cjson-1582c219f55f3938d56fc5ca2cc0bb2286630f03.tar.gz
lua-cjson-1582c219f55f3938d56fc5ca2cc0bb2286630f03.tar.bz2
lua-cjson-1582c219f55f3938d56fc5ca2cc0bb2286630f03.zip
Convert perf results to HTML and update for 2.0.0
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index ac1b803..de1c144 100644
--- a/Makefile
+++ b/Makefile
@@ -73,19 +73,26 @@ TEST_FILES = README bench.lua genutf8.pl test.lua octets-escaped.dat \
73DATAPERM = 644 73DATAPERM = 644
74EXECPERM = 755 74EXECPERM = 755
75 75
76ASCIIDOC ?= asciidoc
77
76BUILD_CFLAGS = -I$(LUA_INCLUDE_DIR) $(CJSON_CFLAGS) 78BUILD_CFLAGS = -I$(LUA_INCLUDE_DIR) $(CJSON_CFLAGS)
77FPCONV_OBJS ?= fpconv.o 79FPCONV_OBJS ?= fpconv.o
78OBJS := lua_cjson.o strbuf.o $(FPCONV_OBJS) 80OBJS := lua_cjson.o strbuf.o $(FPCONV_OBJS)
79 81
80.PHONY: all clean install install-extra doc 82.PHONY: all clean install install-extra doc
81 83
82all: $(TARGET) 84.SUFFIXES: .html .txt
83
84doc: manual.html
85 85
86.c.o: 86.c.o:
87 $(CC) -c $(CFLAGS) $(CPPFLAGS) $(BUILD_CFLAGS) -o $@ $< 87 $(CC) -c $(CFLAGS) $(CPPFLAGS) $(BUILD_CFLAGS) -o $@ $<
88 88
89.txt.html:
90 $(ASCIIDOC) -n -a toc $<
91
92all: $(TARGET)
93
94doc: manual.html performance.html
95
89$(TARGET): $(OBJS) 96$(TARGET): $(OBJS)
90 $(CC) $(LDFLAGS) $(CJSON_LDFLAGS) -o $@ $(OBJS) 97 $(CC) $(LDFLAGS) $(CJSON_LDFLAGS) -o $@ $(OBJS)
91 98
@@ -106,8 +113,5 @@ install-extra:
106 cd tests; cp $(TEST_FILES) $(DESTDIR)/$(LUA_MODULE_DIR)/cjson/tests 113 cd tests; cp $(TEST_FILES) $(DESTDIR)/$(LUA_MODULE_DIR)/cjson/tests
107 cd tests; chmod $(DATAPERM) $(TEST_FILES); chmod $(EXECPERM) *.lua *.pl 114 cd tests; chmod $(DATAPERM) $(TEST_FILES); chmod $(EXECPERM) *.lua *.pl
108 115
109manual.html: manual.txt
110 asciidoc -n -a toc manual.txt
111
112clean: 116clean:
113 rm -f *.o $(TARGET) 117 rm -f *.o $(TARGET)