From 1582c219f55f3938d56fc5ca2cc0bb2286630f03 Mon Sep 17 00:00:00 2001 From: Mark Pulford Date: Fri, 20 Jan 2012 08:17:40 +1030 Subject: Convert perf results to HTML and update for 2.0.0 --- Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Makefile') 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 \ DATAPERM = 644 EXECPERM = 755 +ASCIIDOC ?= asciidoc + BUILD_CFLAGS = -I$(LUA_INCLUDE_DIR) $(CJSON_CFLAGS) FPCONV_OBJS ?= fpconv.o OBJS := lua_cjson.o strbuf.o $(FPCONV_OBJS) .PHONY: all clean install install-extra doc -all: $(TARGET) - -doc: manual.html +.SUFFIXES: .html .txt .c.o: $(CC) -c $(CFLAGS) $(CPPFLAGS) $(BUILD_CFLAGS) -o $@ $< +.txt.html: + $(ASCIIDOC) -n -a toc $< + +all: $(TARGET) + +doc: manual.html performance.html + $(TARGET): $(OBJS) $(CC) $(LDFLAGS) $(CJSON_LDFLAGS) -o $@ $(OBJS) @@ -106,8 +113,5 @@ install-extra: cd tests; cp $(TEST_FILES) $(DESTDIR)/$(LUA_MODULE_DIR)/cjson/tests cd tests; chmod $(DATAPERM) $(TEST_FILES); chmod $(EXECPERM) *.lua *.pl -manual.html: manual.txt - asciidoc -n -a toc manual.txt - clean: rm -f *.o $(TARGET) -- cgit v1.2.3-55-g6feb