Fixed lua-cjson to be working with our compile system

Author: Federico Francescon

.gitignore

@@ -5,3 +5,4 @@ notes
 packages
 tags
 tests/utf8.dat
+cmp/*

Makefile

@@ -11,17 +11,23 @@
 ##                          multi-threaded application. Requries _pthreads_.
 
 ##### Build defaults #####
-LUA_VERSION =       5.3
+LUA_VERSION =       5.4
 TARGET =            cjson.so
 PREFIX =            /usr/local
-#CFLAGS =            -g -Wall -pedantic -fno-inline
-CFLAGS =            -O3 -Wall -pedantic -DNDEBUG
 CJSON_CFLAGS =      -fpic
 CJSON_LDFLAGS =     -shared
+ifdef GWC_ARCH
+BD = 								cmp/$(GWC_ARCH)/
+LUA_INCLUDE_DIR ?=  ../lua
+else
+BD =								./
+#CFLAGS =            -g -Wall -pedantic -fno-inline
+CFLAGS =            -O3 -Wall -pedantic -DNDEBUG
 LUA_INCLUDE_DIR =   $(PREFIX)/include
 LUA_CMODULE_DIR =   $(PREFIX)/lib/lua/$(LUA_VERSION)
 LUA_MODULE_DIR =    $(PREFIX)/share/lua/$(LUA_VERSION)
 LUA_BIN_DIR =       $(PREFIX)/bin
+endif
 
 ##### Platform overrides #####
 ##
@@ -82,12 +88,14 @@ ASCIIDOC =          asciidoc
 BUILD_CFLAGS =      -I$(LUA_INCLUDE_DIR) $(CJSON_CFLAGS)
 OBJS =              lua_cjson.o strbuf.o $(FPCONV_OBJS)
 
+$(shell mkdir -p "$(BD)")
+
 .PHONY: all clean install install-extra doc
 
 .SUFFIXES: .html .adoc
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(BUILD_CFLAGS) -o $@ $<
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(BUILD_CFLAGS) -o $(BD)/$@ $<
 
 .adoc.html:
 	$(ASCIIDOC) -n -a toc $<
@@ -97,7 +105,8 @@ all: $(TARGET)
 doc: manual.html performance.html
 
 $(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) $(CJSON_LDFLAGS) -o $@ $(OBJS)
+	mkdir -p $(BD)
+	$(CC) $(LDFLAGS) $(CJSON_LDFLAGS) -o $(BD)/$@ $(addprefix $(BD)/, $(OBJS))
 
 install: $(TARGET)
 	mkdir -p $(DESTDIR)/$(LUA_CMODULE_DIR)
@@ -117,4 +126,4 @@ install-extra:
 	cd tests; chmod $(DATAPERM) $(TEST_FILES); chmod $(EXECPERM) *.lua *.pl
 
 clean:
-	rm -f *.o $(TARGET)
+	rm -f $(BD)/*.o $(BD)/$(TARGET)

lua_cjson.c

@@ -51,7 +51,7 @@
 #endif
 
 #ifndef CJSON_VERSION
-#define CJSON_VERSION   "2.1devel"
+#define CJSON_VERSION   "2.1.hig"
 #endif
 
 #ifdef _MSC_VER