projects
/
blerg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
fff1744
)
Minor makefile cleanup
author
Chip Black
<bytex64@bytex64.net>
Thu, 23 Dec 2010 09:52:47 +0000
(
03:52
-0600)
committer
Chip Black
<bytex64@bytex64.net>
Thu, 23 Dec 2010 09:52:47 +0000
(
03:52
-0600)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
5722ba5
..
137844b
100644
(file)
--- 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
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)
ar rcu $@ $(blerg_a_objects)
blergtool: $(blergtool_objects)
- gcc $^ -o $@
+ gcc $
(LDFLAGS) $
^ -o $@
http_blerg: $(http_blerg_objects)
http_blerg: $(http_blerg_objects)
- gcc $(LDFLAGS) $(http_blerg_objects) -lpthread -lmicrohttpd -lyajl_s -o $@
+ gcc $(L
IBDIRS) $(L
DFLAGS) $(http_blerg_objects) -lpthread -lmicrohttpd -lyajl_s -o $@
%.o: %.c
%.o: %.c
- gcc $(
CFLAGS) $(LIB
S) -c $< -o $@
+ gcc $(
INCLUDES) $(CFLAG
S) -c $< -o $@