diff options
| -rw-r--r-- | src/Makefile | 21 | ||||
| -rw-r--r-- | src/dnsstub/Makefile | 3 |
2 files changed, 9 insertions, 15 deletions
diff --git a/src/Makefile b/src/Makefile index 8426968..4685a0a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,15 +1,10 @@ -# Makefile for qlibs +SRCS = *.c +OBJS = *.o +COMPILE = ./compile +MAKELIB = ./makelib +SHAREDLIB = ./sharedlib -SHELL=/bin/sh - -# static flags - DO NOT EDIT! -CCFLAGS=-Iinclude - -SRCS=*.c -OBJS=*.o -COMPILE=./compile -MAKELIB=./makelib -SHAREDLIB=./sharedlib +CCFLAGS = -Iinclude default: clean check libs @@ -19,7 +14,7 @@ check: clean: @echo -n Cleaning up libs ... @rm -f `cat TARGETS` - @cd dnsstub ; make -s clean ; cd .. + @$(MAKE) -C dnsstub -s clean @echo " done!" core: alloc.a buffer.a case.a cdb.a constmap.a env.a \ @@ -49,7 +44,7 @@ qlibs.a: obj socket.a dnsresolv.a: @echo "Building @dnsresolv lib ..." - @cd dnsstub ; make + @$(MAKE) -C dnsstub @cp dnsstub/dnsresolv.a dnsresolv.a ln -sf dnsresolv.a libdnsresolv.a diff --git a/src/dnsstub/Makefile b/src/dnsstub/Makefile index ee7f94d..6963fe0 100644 --- a/src/dnsstub/Makefile +++ b/src/dnsstub/Makefile @@ -1,4 +1,3 @@ - COMPILE=../compile MAKELIB=../makelib CCFLAGS=-I../../include @@ -6,7 +5,7 @@ CCFLAGS=-I../../include default: clean check dnsresolv.a check: - @[ -f $(COMPILE) ] && [ -f $(MAKELIB) ] || ( cd .. ; ./configure ; ) + @[ -f $(COMPILE) ] && [ -f $(MAKELIB) ] || (cd .. && ./configure) clean: rm -f `cat TARGETS` |