X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=Makefile;h=137844b1588eb741c769d0429e102d0b660d76f4;hb=4755aca02762c23967027d6b57a94f3c6adcc684;hp=bf270462bc22245f7ba24b2e678b63ceae6d12d5;hpb=3d6d277d4cdfff7c11729cde0e2498b4b3912a98;p=blerg.git

diff --git a/Makefile b/Makefile
index bf27046..137844b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,12 @@
-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 = -Ilibmicrohttpd-0.9.3/src/include -Iyajl/build/yajl-1.0.11/include
+LDFLAGS ?=
+LIBDIRS = -Llibmicrohttpd-0.9.3/src/daemon/.libs -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
+http_blerg_objects = http_blerg.o canned_responses.o auth.o blerg.a
 
 all: $(targets)
 
@@ -15,10 +17,10 @@ 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 $(LIBDIRS) $(LDFLAGS) $(http_blerg_objects) -lpthread -lmicrohttpd -lyajl_s -o $@
 
 %.o: %.c
-	gcc $(CFLAGS) $(LIBS) -c $< -o $@
+	gcc $(INCLUDES) $(CFLAGS) -c $< -o $@