projects
/
blerg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor makefile cleanup
[blerg.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
709b6b9
..
137844b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,30
+1,26
@@
-libmicrohttpd_a = libmicrohttpd-0.9.3/src/daemon/.libs/libmicrohttpd.a
-
-CFLAGS = -g -Ilibmicrohttpd-0.9.3/src/include
-LIB
S =
+CFLAGS ?= -g
+INCLUDES = -Ilibmicrohttpd-0.9.3/src/include -Iyajl/build/yajl-1.0.11/include
+LDFLAGS ?=
+LIB
DIRS = -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
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 blerg.a
+http_blerg_objects = http_blerg.o
canned_responses.o auth.o
blerg.a
all: $(targets)
clean:
rm -f $(targets) $(blerg_a_objects) $(blergtool_objects) $(http_blerg_objects)
all: $(targets)
clean:
rm -f $(targets) $(blerg_a_objects) $(blergtool_objects) $(http_blerg_objects)
- -cd libmicrohttpd-0.9.3 && make distclean
blerg.a: $(blerg_a_objects)
ar rcu $@ $(blerg_a_objects)
blerg.a: $(blerg_a_objects)
ar rcu $@ $(blerg_a_objects)
-$(libmicrohttpd_a):
- cd libmicrohttpd-0.9.3 && ./configure --disable-https --disable-shared && make
-
blergtool: $(blergtool_objects)
blergtool: $(blergtool_objects)
- gcc $^ -o $@
+ gcc $
(LDFLAGS) $
^ -o $@
-http_blerg: $(http_blerg_objects)
$(libmicrohttpd_a)
- gcc $(
http_blerg_objects) -lpthread $(libmicrohttpd_a)
-o $@
+http_blerg: $(http_blerg_objects)
+ gcc $(
LIBDIRS) $(LDFLAGS) $(http_blerg_objects) -lpthread -lmicrohttpd -lyajl_s
-o $@
%.o: %.c
%.o: %.c
- gcc $(
CFLAGS) $(LIB
S) -c $< -o $@
+ gcc $(
INCLUDES) $(CFLAG
S) -c $< -o $@