Merge remote-tracking branch 'bunter/master'

Also, fix makefile

Conflicts:
	src/hammer.c
This commit is contained in:
Dan Hirsch 2012-05-24 15:51:42 +02:00
commit 40be28fb7e
5 changed files with 196 additions and 48 deletions

16
examples/Makefile Normal file
View file

@ -0,0 +1,16 @@
OUTPUTS := dns.o \
dns
TOPLEVEL := ../
include ../common.mk
all: dns
dns: LDFLAGS:=-L../src -lhammer $(LDFLAGS)
dns: dns.o
$(call hush, "Linking $@") $(CC) -o $@ $^ $(LDFLAGS)
dns.o: ../src/hammer.h