From b7b3496a78fd08197899f588a4abc026c8636e74 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Tue, 8 Apr 2014 11:40:16 +0100
Subject: move testament output to object directory instead of modifying source

---
 .gitignore                |  1 -
 Makefile                  | 12 ++++--------
 content/fetchers/Makefile |  2 +-
 content/fetchers/about.c  |  3 ++-
 desktop/Makefile          |  2 +-
 desktop/version.c         |  2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 82d6b6ce1..7088130af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ test/nsoption
 test/nsurl
 test/urldbtest
 test/llcache
-utils/testament.h
 codedocs
 nsgtk
 nsfb
diff --git a/Makefile b/Makefile
index 1638f3228..4f9380a8b 100644
--- a/Makefile
+++ b/Makefile
@@ -609,8 +609,8 @@ clean-target:
 	$(call clean_install_messages, !NetSurf/Resources)
 
 clean-testament:
-	$(VQ)echo "   CLEAN: utils/testament.h"
-	$(Q)$(RM) utils/testament.h
+	$(VQ)echo "   CLEAN: testament.h"
+	$(Q)$(RM) $(OBJROOT)/testament.h
 
 clean-builddir:
 	$(VQ)echo "   CLEAN: $(OBJROOT)"
@@ -621,12 +621,8 @@ all-program: $(EXETARGET) post-exe
 	$(call split_install_messages, any, !NetSurf/Resources)
 
 .PHONY: testament
-testament utils/testament.h:
-	$(Q)if test -d .svn; then \
-		$(PERL) utils/svn-testament.pl $(CURDIR) utils/testament.h; \
-	else \
-		$(PERL) utils/git-testament.pl $(CURDIR) utils/testament.h; \
-	fi
+testament $(OBJROOT)/testament.h:
+	$(Q)$(PERL) utils/git-testament.pl $(CURDIR) $(OBJROOT)/testament.h
 
 post-exe: $(POSTEXES)
 
diff --git a/content/fetchers/Makefile b/content/fetchers/Makefile
index 06e38e4c8..855154232 100644
--- a/content/fetchers/Makefile
+++ b/content/fetchers/Makefile
@@ -5,4 +5,4 @@ S_FETCHERS := curl.c data.c file.c about.c resource.c
 S_FETCHERS := $(addprefix content/fetchers/,$(S_FETCHERS))
 
 # The following files depend on the testament
-content/fetchers/about.c: testament utils/testament.h
+content/fetchers/about.c: testament $(OBJROOT)/testament.h
diff --git a/content/fetchers/about.c b/content/fetchers/about.c
index 8e973a9cc..f0244a975 100644
--- a/content/fetchers/about.c
+++ b/content/fetchers/about.c
@@ -41,6 +41,8 @@
 
 #include <libwapcaplet/libwapcaplet.h>
 
+#include "testament.h"
+
 #include "utils/config.h"
 #include "content/dirlist.h"
 #include "content/fetch.h"
@@ -54,7 +56,6 @@
 #include "utils/url.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
-#include "utils/testament.h"
 #include "image/image_cache.h"
 
 struct fetch_about_context;
diff --git a/desktop/Makefile b/desktop/Makefile
index a914eb3e4..218f60e67 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -8,7 +8,7 @@ S_DESKTOP := cookie_manager.c knockout.c hotlist.c mouse.c		\
 S_DESKTOP := $(addprefix desktop/,$(S_DESKTOP))
 
 # version.c needs the testament
-desktop/version.c: testament utils/testament.h
+desktop/version.c: testament $(OBJROOT)/testament.h
 
 # S_BROWSER are sources related to full browsers but are common
 # between RISC OS, GTK, BeOS and AmigaOS builds
diff --git a/desktop/version.c b/desktop/version.c
index 11544c01b..4a92a5bb9 100644
--- a/desktop/version.c
+++ b/desktop/version.c
@@ -1,4 +1,4 @@
-#include "utils/testament.h"
+#include "testament.h"
 
 const char * const netsurf_version = "3.1 (Dev"
 #if defined(CI_BUILD)
-- 
cgit v1.2.3