project restructure

Makefile

@@ -3,22 +3,55 @@ LD = gcc
 CFLAGS = -Wall -g -std=c99 -ICFloor/src/ -ICson/src/ -D_POSIX_SOURCE
 LDFLAGS = -lpthread -lrt
 
-test: main.o router.o request.o test.o CFloor/libcfloor.a Cson/libcson.a
+CFLOOR_LIB = CFloor/libcfloor.a
+CSON_LIB = Cson/libcson.a
+LIBS = $(CFLOOR_LIB) $(CSON_LIB)
+
+OBJS = obj/router.o obj/request.o obj/base_cfloor.o
+DEPS = $(OBJS:%.o=%.d)
+
+DEMO_OBJS = obj/demo.o
+
+HAS_MAIN =
+NEEDS_MAIN = \
+if test "$(HAS_MAIN)" != "yes"; then\
+	echo "ERROR: Trying to build standalone without base.";\
+	echo "       Specify target base_cfloor instead.";\
+	exit 1;\
+fi
+
+all: base_cfloor clean
+
+base_cfloor: CFLAGS += -DBASE_CFLOOR
+base_cfloor: HAS_MAIN = "yes"
+base_cfloor: standalone
+
+
+standalone: $(DEMO_OBJS) $(OBJS) $(LIBS)
+	@$(NEEDS_MAIN)
 	$(LD) $(LDFLAGS) -o $@ $^
 
-CFloor/libcfloor.a:
+$(CFLOOR_LIB):
 	$(MAKE) -C CFloor/ libcfloor.a
 	
-Cson/libcson.a:
+$(CSON_LIB):
 	$(MAKE) -C Cson/ libcson.a
 
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-	
-#main.o: main.c router.h
-#router.o: router.c router.h
-#test.o: controller.h
+-include $(DEPS)
+
+obj/%.o: demo/%.c obj
+	$(CC) $(CFLAGS) -Isrc/ -MMD -c -o $@ $<
+
+obj/%.o: src/%.c obj
+	$(CC) $(CFLAGS) -MMD -c -o $@ $<
 	
+obj:
+	@mkdir -p obj
+
 clean:
-	rm -f *.o test
+	@echo "Cleaning up..."
+	@rm -f obj/*.o
+	@rm -f obj/*.d
+	@rm -f standalone
 	$(MAKE) -C CFloor/ clean
+	$(MAKE) -C Cson/ clean

demo/demo.c

@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "controller.h"
+#include <controller.h>
 
 
 GET("/", hello);
@@ -12,5 +12,5 @@ response_t hello(ctx_t ctx) {
 
 GET("/foobar", foobar);
 response_t foobar(ctx_t ctx) {
-	return fileResponse("foobar.txt");
+	return fileResponse("demo/foobar.txt");
 }

src/base_cfloor.c

@@ -1,3 +1,5 @@
+#ifdef BASE_CFLOOR
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -80,3 +82,5 @@ int main() {
 	}
 	return 0;
 }
+
+#endif

src/common.h

@@ -1,5 +1,5 @@
-#ifndef MISC_H_
-#define MISC_H_
+#ifndef COMMON_H_
+#define COMMON_H_
 
 #include <misc.h>
 

src/request.c

@@ -12,7 +12,6 @@
 
 #include <json.h>
 
-
 #include "request.h"
 
 response_t emptyResponse() {

src/router.h

@@ -1,8 +1,6 @@
 #ifndef ROUTER_H
 #define ROUTER_H
 
-#include <misc.h>
-
 #include "handler.h"
 
 int registerRoute(method_t method, const char* path, handle_t handle);