Merge branch 'develop' into 'master'

Develop

See merge request !1

.gitlab-ci.yml

@@ -0,0 +1,14 @@
+stages:
+  - build
+
+build:
+  stage: build
+  script:
+    - make
+  artifacts: 
+    paths:
+      - '*.o'
+    expire_in: 1 hour
+  tags:
+    - kcgi
+

Makefile

@@ -110,7 +110,7 @@ clean:
 	    -e "s!@CGIURI@!$(CGIURI)!g" $< >$@
 
 $(TARGET): $(OBJS)
-	$(CC) $(STATIC) -o $@ $(OBJS) externals/ksql.o $(LDFLAGS) -lkcgi -lkcgijson -lz -lsqlite3 -pthread
+	$(CC) $(STATIC) -o $@ $(OBJS) $(LDFLAGS) -lksql -lkcgi -lkcgijson -lz -lsqlite3 -pthread
 
 $(OBJS): extern.h
 

db.c

@@ -24,7 +24,7 @@
 
 #include <kcgi.h>
 #include <kcgijson.h>
-#include "ksql.h"
+#include <ksql.h>
 
 #include "extern.h"