Update Makefiles and fix dependencies

Makefile

@@ -115,12 +115,16 @@ ${BUILDDIR_RELEASE}/%.o: %.c
 	@mkdir -p $(dir $(abspath $@))
 	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} -o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
 
-${PROJECT}: ${OBJECTS}
+${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}: ${OBJECTS}
 	$(call colorecho,CC,$@)
 	@mkdir -p ${BUILDDIR_RELEASE}/${BINDIR}
 	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} \
 		-o ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT} ${OBJECTS} ${LIBS}
 
+${PROJECT}: ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}
+
+release: ${PROJECT}
+
 # debug build
 
 ${OBJECTS_DEBUG}: config.mk ${PROJECT}/version.h \
@@ -133,13 +137,13 @@ ${BUILDDIR_DEBUG}/%.o: %.c
 	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${DFLAGS} \
 		-o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
 
-${PROJECT}-debug: ${OBJECTS_DEBUG}
+${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}: ${OBJECTS_DEBUG}
 	$(call colorecho,CC,$@)
 	@mkdir -p ${BUILDDIR_DEBUG}/${BINDIR}
 	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} \
 		-o ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT} ${OBJECTS} ${LIBS}
 
-debug: ${PROJECT}-debug
+debug: ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}
 
 # gcov build
 
@@ -153,13 +157,13 @@ ${BUILDDIR_GCOV}/%.o: %.c
 	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${GCOV_CFLAGS} \
 		-o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
 
-${PROJECT}-gcov: ${OBJECTS_GCOV}
+${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}: ${OBJECTS_GCOV}
 	$(call colorecho,CC,$@)
 	@mkdir -p ${BUILDDIR_GCOV}/${BINDIR}
 	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} ${GCOV_CFLAGS} ${GCOV_LDFLAGS} \
 		-o ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT} ${OBJECTS} ${LIBS}
 
-gcov: options ${PROJECT}-gcov
+gcov: options ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}
 	$(QUIET)${MAKE} -C tests run-gcov
 	$(call colorecho,LCOV,"Analyse data")
 	$(QUIET)${LCOV_EXEC} ${LCOV_FLAGS}

tests/Makefile

@@ -52,26 +52,10 @@ ifneq ($(wildcard ${VALGRIND_SUPPRESSION_FILE}),)
 VALGRIND_ARGUMENTS += --suppressions=${VALGRIND_SUPPRESSION_FILE}
 endif
 
-ifeq (,$(findstring -DZATHURA_PLUGINDIR,${CPPFLAGS}))
+all: release
-CPPFLAGS += -DZATHURA_PLUGINDIR=\"${PLUGINDIR}\"
-endif
-ifeq (,$(findstring -DGETTEXT_PACKAGE,${CPPFLAGS}))
-CPPFLAGS += -DGETTEXT_PACKAGE=\"${PROJECT}\"
-endif
-ifeq (,$(findstring -DLOCALEDIR,${CPPFLAGS}))
-CPPFLAGS += -DLOCALEDIR=\"${LOCALEDIR}\"
-endif
-
-all: ${PROJECT}
 
 # release
 
-${PROJECT}: options ${OBJECTS}
-	$(QUIET)${MAKE} WITH_LIBFIU=1 -C .. zathura
-	$(call colorecho,CC,$@)
-	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} -o $@ \
-		${OBJECTS} ${ZATHURA_OBJECTS} ${LIBS}
-
 ${OBJECTS}: config.mk ../config.mk ../zathura/version.h
 
 ${BUILDDIR_RELEASE}/%.o: %.c
@@ -81,19 +65,21 @@ ${BUILDDIR_RELEASE}/%.o: %.c
 	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} \
 		-o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
 
-run: ${PROJECT}
+${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}: ${OBJECTS}
-	$(QUIET)${FIU_EXEC} ./${PROJECT}
+	$(QUIET)${MAKE} WITH_LIBFIU=1 -C .. ${BUILDDIR_RELEASE}/${BINDIR}/zathura
+	$(call colorecho,CC,$@)
+	@mkdir -p ${BUILDDIR_RELEASE}/${BINDIR}
+	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} \
+		-o ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT} \
+		${OBJECTS} ${ZATHURA_OBJECTS} ${LIBS}
+
+release: ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}
+
+run: ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}
+	$(QUIET)${FIU_EXEC} ./${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT}
 
 # debug
 
-debug: options ${PROJECT}-debug
-
-${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}
-
 ${OBJECTS_DEBUG}: config.mk ../config.mk ../zathura/version.h
 
 ${BUILDDIR_DEBUG}/%.o: %.c
@@ -103,19 +89,21 @@ ${BUILDDIR_DEBUG}/%.o: %.c
 	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${DFLAGS} \
 		-o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
 
-run-debug: ${PROJECT}-debug
+${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}: ${OBJECTS_DEBUG}
-	$(QUIET)${FIU_EXEC} ./${PROJECT}-debug
+	$(QUIET)${MAKE} WITH_LIBFIU=1 -C .. ${BUILDDIR_DEBUG}/${BINDIR}/zathura
+	$(call colorecho,CC,$@)
+	@mkdir -p ${BUILDDIR_DEBUG}/${BINDIR}
+	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} \
+		-o ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT} \
+		${OBJECTS} ${ZATHURA_OBJECTS_DEBUG} ${LIBS}
+
+debug: ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}
+
+run-debug: ${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}
+	$(QUIET)${FIU_EXEC} ./${BUILDDIR_DEBUG}/${BINDIR}/${PROJECT}
 
 # gcov
 
-gcov: options ${PROJECT}-gcov
-
-${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}
-
 ${OBJECTS_GCOV}: config.mk ../config.mk ../zathura/version.h
 
 ${BUILDDIR_GCOV}/%.o: %.c
@@ -125,8 +113,18 @@ ${BUILDDIR_GCOV}/%.o: %.c
 	$(QUIET)${CC} -c ${CPPFLAGS} ${CFLAGS} ${GCOV_CFLAGS} ${DFLAGS} ${GCOV_DFLAGS} \
 		-o $@ $< -MMD -MF ${DEPENDDIR}/$(abspath $@).dep
 
-run-gcov: ${PROJECT}-gcov
+${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}: ${OBJECTS_GCOV}
-	$(QUIET)${FIU_EXEC} ./${PROJECT}-gcov
+	$(QUIET)${MAKE} WITH_LIBFIU=1 -C .. ${BUILDDIR_GCOV}/${BINDIR}/zathura
+	$(call colorecho,CC,$@)
+	@mkdir -p ${BUILDDIR_GCOV}/${BINDIR}
+	$(QUIET)${CC} ${SFLAGS} ${LDFLAGS} ${GCOV_CFLAGS} ${GCOV_LDFLAGS} \
+		-o ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT} \
+		${OBJECTS} ${ZATHURA_OBJECTS_GCOV} ${LIBS}
+
+gcov: ${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}
+
+run-gcov: gcov
+	$(QUIET)${FIU_EXEC} ./${BUILDDIR_GCOV}/${BINDIR}/${PROJECT}
 
 ../zathura/version.h:
 	$(MAKE) -C .. zathura/version.h