X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=Makefile;h=5113e701f6898df8fee225723cd599cbf1c9dda7;hb=65e6e5bf86b8474d7178beb870901e2a8e9e0d17;hp=bf270462bc22245f7ba24b2e678b63ceae6d12d5;hpb=3d6d277d4cdfff7c11729cde0e2498b4b3912a98;p=blerg.git

diff --git a/Makefile b/Makefile
index bf27046..5113e70 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,14 @@
-CFLAGS = -g -Ilibmicrohttpd-0.9.3/src/include -Iyajl/build/yajl-1.0.11/include
-LDFLAGS = -Llibmicrohttpd-0.9.3/src/daemon/.libs -Lyajl/build/yajl-1.0.11/lib
+CFLAGS ?= -g
+INCLUDES = -I. -Ifcgi -Idatabase -Icommon -Icgi-util-2.2.1 -Ilibmicrohttpd-0.9.3/src/include -Iyajl/build/yajl-1.0.11/include
+LDFLAGS ?=
+HTTP_LIBDIRS = -Llibmicrohttpd-0.9.3/src/daemon/.libs -Lyajl/build/yajl-1.0.11/lib
+CGI_LIBDIRS = -Lcgi-util-2.2.1 -Lyajl/build/yajl-1.0.11/lib
 
-targets = blerg.a blergtool http_blerg
-blerg_a_objects = database.o tags.o
-blergtool_objects = blergtool.o blerg.a
-http_blerg_objects = http_blerg.o auth.o blerg.a
+targets = blerg.a blergtool http_blerg cgi_blerg
+blerg_a_objects = database/database.o database/tags.o
+blergtool_objects = tools/blergtool.o blerg.a
+http_blerg_objects = http/http_blerg.o http/canned_responses.o common/app.o common/auth.o blerg.a
+cgi_blerg_objects = cgi/cgi_blerg.o common/app.o common/auth.o blerg.a
 
 all: $(targets)
 
@@ -15,10 +19,13 @@ blerg.a: $(blerg_a_objects)
 	ar rcu $@ $(blerg_a_objects)
 
 blergtool: $(blergtool_objects)
-	gcc $^ -o $@
+	gcc $(LDFLAGS) $^ -o $@
 
 http_blerg: $(http_blerg_objects)
-	gcc $(LDFLAGS) $(http_blerg_objects) -lpthread -lmicrohttpd -lyajl_s -o $@
+	gcc $(HTTP_LIBDIRS) $(LDFLAGS) $(http_blerg_objects) -lpthread -lmicrohttpd -lyajl_s -o $@
+
+cgi_blerg: $(cgi_blerg_objects)
+	gcc $(CGI_LIBDIRS) $(LDFLAGS) $(cgi_blerg_objects) -lcgi-util -lyajl_s -o $@
 
 %.o: %.c
-	gcc $(CFLAGS) $(LIBS) -c $< -o $@
+	gcc $(INCLUDES) $(CFLAGS) -c $< -o $@