From c1e05c92f45fd2840f29d93bb3110519e2efabba Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Fri, 7 Nov 2014 16:01:29 +0100 Subject: [PATCH] Update test Makefile --- tests/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 21df56e..dbcae71 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -61,11 +61,10 @@ all: ${PROJECT} # release ${PROJECT}: options ${OBJECTS} - @echo "zathura objects: ${ZATHURA_OBJECTS}" $(QUIET)${MAKE} WITH_LIBFIU=1 -C .. zathura $(call colorecho,CC,$@) $(QUIET)${CC} ${SFLAGS} ${LDFLAGS} -o $@ \ - ${OBJECTS} ${ZATHURA_OBJECTS} ${LIBS} ${ZATHURA_RELEASE} + ${OBJECTS} ${ZATHURA_OBJECTS} ${LIBS} ${OBJECTS}: config.mk ../config.mk ../zathura/version.h @@ -87,7 +86,7 @@ ${PROJECT}-debug: ${OBJECTS_DEBUG} $(QUIET)${MAKE} WITH_LIBFIU=1 -C .. zathura-debug $(call colorecho,CC,$@) $(QUIET)${CC} ${LDFLAGS} -o $@ \ - ${OBJECTS_DEBUG} ${ZATHURA_OBJECTS_DEBUG} ${LIBS} ${ZATHURA_DEBUG} + ${OBJECTS_DEBUG} ${ZATHURA_OBJECTS_DEBUG} ${LIBS} ${OBJECTS_DEBUG}: config.mk ../config.mk ../zathura/version.h @@ -109,7 +108,7 @@ ${PROJECT}-gcov: options ${OBJECTS_GCOV} $(QUIET)${MAKE} WITH_LIBFIU=1 -C .. zathura-gcov $(call colorecho,CC,$@) $(QUIET)${CC} ${LDFLAGS} ${GCOV_LDFLAGS} -o $@ \ - ${OBJECTS_GCOV} ${ZATHURA_OBJECTS_GCOV} ${LIBS} ${ZATHURA_GCOV} + ${OBJECTS_GCOV} ${ZATHURA_OBJECTS_GCOV} ${LIBS} ${OBJECTS_GCOV}: config.mk ../config.mk ../zathura/version.h @@ -137,8 +136,6 @@ clean: $(QUIET)rm -rf ${BUILDDIR} $(QUIET)rm -rf ${DEPENDDIR} - $(QUIET)${MAKE} -C plugin clean - .PHONY: all options clean debug run -include $(wildcard ${DEPENDDIR}/*.dep)