Flatten include and src directories.

Makefile

@@ -4,28 +4,21 @@ all: test
 
 check:
 	splint \
-	-Iinclude -Iinclude/structures -Iinclude/model/rdf -Iext/binn/src \
-	-Iext/xxHash \
+	-Iinclude -Iext/xxHash \
 	-preproc \
 	test.c
 
 build:
 	gcc -g -Wall \
 		-std=c99 \
-		-DDEBUG \
-		-Iinclude -Iinclude/structures -Iinclude/model/rdf \
-		-Iext/xxHash \
-		ext/xxHash/xxhash.c \
-		src/*.c src/structures/*.c src/model/rdf/*.c \
+		-Iinclude -Iext/xxHash \
+		ext/xxHash/xxhash.c src/*.c \
 		-o bin/lsup_rdf.so
 
 test:
 	gcc -g -Wall \
 		-std=c99 \
 		-DDEBUG \
-		-Iinclude -Iinclude/structures -Iinclude/model/rdf \
-		-Iext/xxHash \
-		-Itest \
-		ext/xxHash/xxhash.c \
-		src/*.c src/structures/*.c src/model/rdf/*.c test.c \
+		-Iinclude -Iext/xxHash -Itest \
+		ext/xxHash/xxhash.c src/*.c test.c \
 		-o bin/test

include/model/rdf/graph.h → include/graph.h

@@ -1,9 +1,9 @@
 #ifndef _LSUP_GRAPH_H
 #define _LSUP_GRAPH_H
 
-#include "structures/keyset.h"
-#include "structures/index.h"
-#include "model/rdf/triple.h"
+#include "keyset.h"
+#include "index.h"
+#include "triple.h"
 
 
 typedef enum LSUP_store_type {

include/structures/index.h → include/index.h

@@ -13,8 +13,8 @@
  * the value without having to look up the table.
  */
 
-#include "structures/buffer.h"
-#include "model/rdf/term.h"
+#include "buffer.h"
+#include "term.h"
 
 typedef struct Index LSUP_Index;
 

include/lsup_rdf.h

@@ -1,7 +1,7 @@
 #ifndef _LSUP_RDF_H
 #define _LSUP_RDF_H
 
-#include "model/rdf/graph.h"
-#include "structures/keyset.h"
+#include "graph.h"
+#include "keyset.h"
 
 #endif

include/model/rdf/triple.h → include/triple.h

@@ -1,4 +1,4 @@
-#include "model/rdf/term.h"
+#include "term.h"
 
 typedef struct LSUP_Triple {
     LSUP_Term *s;

src/structures/buffer.c → src/buffer.c

@@ -1,4 +1,4 @@
-#include "structures/buffer.h"
+#include "buffer.h"
 
 // Inline extern prototypes
 

src/model/rdf/graph.c → src/graph.c

@@ -1,4 +1,4 @@
-#include "model/rdf/graph.h"
+#include "graph.h"
 
 /**
  * Extern inline functions.

src/structures/index.c → src/index.c

@@ -1,4 +1,4 @@
-#include "structures/index.h"
+#include "index.h"
 
 struct IndexEntry {
     LSUP_Key key;

src/structures/keyset.c → src/keyset.c

@@ -1,6 +1,6 @@
 #include <math.h>
 
-#include "structures/keyset.h"
+#include "keyset.h"
 
 #define KLEN sizeof(LSUP_Key)
 #define DBL_KLEN sizeof(LSUP_DoubleKey)

src/model/rdf/term.c → src/term.c

@@ -1,7 +1,7 @@
 //#define PY_SSIZE_T_CLEAN
 //#include <Python.h>
 
-#include "model/rdf/term.h"
+#include "term.h"
 
 #define CHR         sizeof(char)
 #define NLEN(str)   (str) == NULL ? 0 : strlen((str))