Add RSS CGI, also quite a lot of refactoring

[blerg.git] / Makefile

diff --git a/Makefile b/Makefile
index 2e49315..640be85 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,22 @@
 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 -Iyajl/build/yajl-1.0.11/include
+HTTP_INCLUDES = -Ihttp -Ilibmicrohttpd-0.9.3/src/include
+CGI_INCLUDES = -Icgi -Icgi-util-2.2.1
 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 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 +30,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 $@