From 4755aca02762c23967027d6b57a94f3c6adcc684 Mon Sep 17 00:00:00 2001 From: Chip Black Date: Thu, 23 Dec 2010 03:52:47 -0600 Subject: [PATCH] Minor makefile cleanup --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5722ba5..137844b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ -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 @@ -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 $@ -- 2.25.1