Merge branch 'master' into base64-example

This commit is contained in:
Sven M. Hallberg 2013-02-17 15:25:58 +01:00
commit dd763f0c07
11 changed files with 967 additions and 682 deletions

View file

@ -19,14 +19,13 @@ LDFLAGS += $(pkg-config --libs glib-2.0)
all: dns base64 base64_sem1 base64_sem2
dns: LDFLAGS:=-L../src -lhammer $(LDFLAGS)
dns: dns.o rr.o dns_common.o
dns: dns.o rr.o dns_common.o glue.o
$(call hush, "Linking $@") $(CC) -o $@ $^ $(LDFLAGS)
dns.o: ../src/hammer.h dns_common.h
rr.o: ../src/hammer.h rr.h dns_common.h
dns_common.o: ../src/hammer.h dns_common.h
glue.o: ../src/hammer.h glue.h
base64%: LDFLAGS:=-L../src -lhammer $(LDFLAGS)
base64%: base64%.o