X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=Makefile;h=ed19b522059d843963b568b8507290a2d350e06d;hb=4e824b6fa432f65753fd00323375c6bbdde7a7f9;hp=2e49315f050987c6226d421d0255103bd03ad311;hpb=96ec261b36bdbb701e05f5ee1aab70dec44085f9;p=blerg.git

diff --git a/Makefile b/Makefile
index 2e49315..ed19b52 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,24 @@
+include libs.mk
+
 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
+INCLUDES = -I. -Idatabase -Icommon $(YAJL_INCLUDES)
+HTTP_INCLUDES = -Ihttp $(MHD_INCLUDES)
+CGI_INCLUDES = -Icgi $(CGI_UTIL_INCLUDES)
 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
+HTTP_LIBDIRS = $(MHD_LIBDIR) $(YAJL_LIBDIR)
+CGI_LIBDIRS = $(CGI_UTIL_LIBDIR) $(YAJL_LIBDIR)
 
-targets = blerg.a blergtool http_blerg cgi_blerg
+targets = blerg.a blergtool http_blerg cgi_blerg rss
 blerg_a_objects = database/database.o database/tags.o database/util.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
+rss_objects = cgi/rss.o cgi/canned_responses.o common/app.o common/escapery.o blerg.a
+http_blerg_objects = http/http_blerg.o http/canned_responses.o common/app.o common/json.o common/auth.o blerg.a
+cgi_blerg_objects = cgi/cgi_blerg.o cgi/canned_responses.o common/app.o common/json.o common/auth.o blerg.a
 
 all: $(targets)
 
 clean:
-	rm -f $(targets) $(blerg_a_objects) $(blergtool_objects) $(http_blerg_objects)
+	rm -f $(targets) $(blerg_a_objects) $(blergtool_objects) $(http_blerg_objects) $(cgi_blerg_objects) $(rss_objects)
 
 blerg.a: $(blerg_a_objects)
 	ar rcu $@ $(blerg_a_objects)
@@ -27,5 +32,14 @@ http_blerg: $(http_blerg_objects)
 cgi_blerg: $(cgi_blerg_objects)
 	gcc $(CGI_LIBDIRS) $(LDFLAGS) $(cgi_blerg_objects) -lcgi-util -lyajl_s -o $@
 
+rss: $(rss_objects)
+	gcc $(CGI_LIBDIRS) $(LDFLAGS) $(rss_objects) -lcgi-util -o $@
+
+http/%.o: http/%.c
+	gcc $(INCLUDES) $(HTTP_INCLUDES) $(CFLAGS) -c $< -o $@
+
+cgi/%.o: cgi/%.c
+	gcc $(INCLUDES) $(CGI_INCLUDES) $(CFLAGS) -c $< -o $@
+
 %.o: %.c
 	gcc $(INCLUDES) $(CFLAGS) -c $< -o $@