From e96c96f2764440d11fbaf7a1a283600d1f9f4dcd Mon Sep 17 00:00:00 2001
From: Moritz Lipp <mlq@pwmt.org>
Date: Fri, 7 Nov 2014 18:08:59 +0100
Subject: [PATCH] Update Makefile

---
 Makefile         |  8 +++-----
 tests/.gitignore |  2 ++
 tests/Makefile   | 10 ++++++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index fe97a08..17ccb94 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ OBJECTS_GCOV  = $(addprefix ${BUILDDIR_GCOV}/,${SOURCE:.c=.o}) \
 	${BUILDDIR_GCOV}/${PROJECT}/css-definitions.o \
 	${BUILDDIR_GCOV}/${PROJECT}/dbus-interface-definitions.o
 HEADER        = $(wildcard ${PROJECT}/*.h) $(wildcard synctex/*.h)
-HEADERINST    = version.h document.h macros.h page.h types.h plugin-api.h links.h
+HEADERINST    = $(addprefix ${PROJECT}/,version.h document.h macros.h page.h types.h plugin-api.h links.h)
 
 all: options ${PROJECT} po build-manpages
 
@@ -171,6 +171,7 @@ gcov: options ${PROJECT}-gcov
 clean:
 	$(QUIET)rm -rf \
 		${BUILDDIR} \
+		${DEPENDDIR} \
 		${TARFILE} \
 		${TARDIR} \
 		${PROJECT}.pc \
@@ -180,11 +181,8 @@ clean:
 		${PROJECT}/dbus-interface-definitions.c.tmp \
 		${PROJECT}/css-definitions.c \
 		${PROJECT}/css-definitions.c.tmp \
-		*gcda \
-		*gcno \
 		$(PROJECT).info \
 		gcov \
-		*.tmp \
 		.version-checks
 	$(QUIET)$(MAKE) -C tests clean
 	$(QUIET)$(MAKE) -C po clean
@@ -260,7 +258,7 @@ install-appdata:
 install: all install-headers install-manpages install-dbus install-appdata
 	$(call colorecho,INSTALL,"executeable file")
 	$(QUIET)mkdir -m 755 -p ${DESTDIR}${PREFIX}/bin
-	$(QUIET)install -m 755 ${PROJECT} ${DESTDIR}${PREFIX}/bin
+	$(QUIET)install -m 755 ${BUILDDIR_RELEASE}/${BINDIR}/${PROJECT} ${DESTDIR}${PREFIX}/bin
 	$(QUIET)mkdir -m 755 -p ${DESTDIR}${DESKTOPPREFIX}
 	$(call colorecho,INSTALL,"desktop file")
 	$(QUIET)install -m 644 ${PROJECT}.desktop ${DESTDIR}${DESKTOPPREFIX}
diff --git a/tests/.gitignore b/tests/.gitignore
index 2b29f27..75c5b11 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1 +1,3 @@
 tests
+tests-gcov
+tests-debug
diff --git a/tests/Makefile b/tests/Makefile
index dbcae71..d035fc7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -14,6 +14,10 @@ OBJECTS_GCOV  = $(addprefix ${BUILDDIR_GCOV}/,${SOURCE:.c=.o})
 
 ZATHURA_OBJECTS =  \
 	$(filter-out ../${BUILDDIR_RELEASE}/zathura/main.o, $(wildcard ../${BUILDDIR_RELEASE}/zathura/*.o))
+ZATHURA_OBJECTS_DEBUG =  \
+	$(filter-out ../${BUILDDIR_DEBUG}/zathura/main.o, $(wildcard ../${BUILDDIR_DEBUG}/zathura/*.o))
+ZATHURA_OBJECTS_GCOV=  \
+	$(filter-out ../${BUILDDIR_GCOV}/zathura/main.o, $(wildcard ../${BUILDDIR_GCOV}/zathura/*.o))
 
 ifneq (${WITH_SQLITE},0)
 INCS     += $(SQLITE_INC)
@@ -31,11 +35,13 @@ endif
 
 ifneq ($(WITH_SYSTEM_SYNCTEX),0)
 else
-ZATHURA_OBJECTS += $(wildcard ../${BUILDDIR_RELEASE}/zathura/synctex/*.o)
+ZATHURA_OBJECTS       += $(wildcard ../${BUILDDIR_RELEASE}/zathura/synctex/*.o)
+ZATHURA_OBJECTS_DEBUG += $(wildcard ../${BUILDDIR_DEBUG}/zathura/synctex/*.o)
+ZATHURA_OBJECTS_GCOV  += $(wildcard ../${BUILDDIR_GCOV}/zathura/synctex/*.o)
 LIBS   += $(ZLIB_LIB)
 
 ifeq (,$(findstring -Isynctex,${CPPFLAGS}))
-CPPFLAGS += -I${PROJECT}/synctex
+CPPFLAGS += -I../zathura/synctex
 endif
 ifeq (,$(findstring -DSYNCTEX_VERBOSE=0,${CPPFLAGS}))
 CPPFLAGS += -DSYNCTEX_VERBOSE=0