diff --git a/Makefile b/Makefile index 2665952..2ebee0f 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,8 @@ ${PROJECT}: ${OBJECTS} clean: $(QUIET)rm -rf ${PROJECT} ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \ - ${DOBJECTS} ${PROJECT}-debug .depend ${PROJECT}.pc + ${DOBJECTS} ${PROJECT}-debug .depend ${PROJECT}.pc doc + $(QUIET)make -C tests clean ${PROJECT}-debug: ${DOBJECTS} $(ECHO) CC -o $@ @@ -76,8 +77,8 @@ tests: ${OBJECTS} dist: clean $(QUIET)mkdir -p ${PROJECT}-${VERSION} - $(QUIET)cp -R LICENSE Makefile config.mk README Doxyfile \ - ${PROJECT}.1 ${SOURCE} ${HEADER} ${PROJECT}.pc.in \ + $(QUIET)cp -R LICENSE Makefile config.mk common.mk README Doxyfile \ + ${PROJECT}.1 ${SOURCE} ${HEADER} ${PROJECT}.pc.in tests \ ${PROJECT}-${VERSION} $(QUIET)tar -cf ${PROJECT}-${VERSION}.tar ${PROJECT}-${VERSION} $(QUIET)gzip ${PROJECT}-${VERSION}.tar diff --git a/tests/Makefile b/tests/Makefile index 50e003f..272a112 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -21,7 +21,7 @@ ZSOURCE += ../database-plain.c endif endif -all: options ${PROJECT} run +all: ${PROJECT} run run: ${PROJECT} $(QUIET)./${PROJECT} @@ -38,7 +38,8 @@ options: @mkdir -p .depend $(QUIET)${CC} -c -I.. ${CPPFLAGS} ${CFLAGS} -o $@ $< -MMD -MF .depend/$@.dep -${PROJECT}: ${OBJECTS} +${PROJECT}: options ${OBJECTS} + $(QUIET)make -C .. $(ECHO) CC -o $@ $(QUIET)${CC} ${SFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${ZOBJECTS} ${LIBS}