diff --git a/Makefile b/Makefile index 86f7430..8e0a66f 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,8 @@ .PHONY: test .PHONY: lib -default: - @/bin/echo -e "Usage:\n\tmake diet - compile with diet libc\n\tmake glibc - compile with normal gnu libc\n\tmake test\n\tmake doc" - -lib: - ${MAKE} -C src lib +all: + ${MAKE} -C src diet: ${MAKE} -C src diet @@ -21,3 +18,6 @@ clean: make -C src clean make -C test clean rm -rf doc/html doc/latex doc/man + +help: + @/bin/echo -e "Usage:\n\tmake - compile\n\tmake diet - compile with diet libc\n\tmake test\n\tmake doc" diff --git a/src/Makefile b/src/Makefile index c8a0f88..26c07fd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,24 +2,21 @@ OPT = -O2 DEBUG = 2 CFLAGS = -I../include -Wall ${OPT} DIET = diet -WRAPPER = S = packet.c misc.c parser.c match.c render.c memmem.c itoa.c variable.c O = packet.o misc.o parser.o match.o render.o memmem.o itoa.o variable.o +all: CC := ${WRAPPER} ${CC} all: lib -help: - @/bin/echo -e "Usage:\n\tmake diet - compile with diet libc\n\tmake lib - compile with normal gnu libc" - debug: CFLAGS += -DDEBUG=${DEBUG} -g debug: CFLAGS := $(subst ${OPT},-O0,${CFLAGS}) debug: lib diet: WRAPPER = ${DIET} +diet: CC := ${WRAPPER} ${CC} diet: lib -lib: CC := ${WRAPPER} ${CC} lib: $O @mkdir -p ../lib ${WRAPPER} ar rcs ../lib/libpsyc.a $O @@ -34,3 +31,6 @@ it: match clean: rm -f $O ../lib/libpsyc.a + +help: + @/bin/echo -e "Usage:\n\tmake - compile\n\tmake diet - compile with diet libc"