move testament output to object directory instead of modifying source

This commit is contained in:
Vincent Sanders 2014-04-08 11:40:16 +01:00
parent 9ba0d66c6d
commit b7b3496a78
6 changed files with 9 additions and 13 deletions

1
.gitignore vendored
View File

@ -16,7 +16,6 @@ test/nsoption
test/nsurl test/nsurl
test/urldbtest test/urldbtest
test/llcache test/llcache
utils/testament.h
codedocs codedocs
nsgtk nsgtk
nsfb nsfb

View File

@ -609,8 +609,8 @@ clean-target:
$(call clean_install_messages, !NetSurf/Resources) $(call clean_install_messages, !NetSurf/Resources)
clean-testament: clean-testament:
$(VQ)echo " CLEAN: utils/testament.h" $(VQ)echo " CLEAN: testament.h"
$(Q)$(RM) utils/testament.h $(Q)$(RM) $(OBJROOT)/testament.h
clean-builddir: clean-builddir:
$(VQ)echo " CLEAN: $(OBJROOT)" $(VQ)echo " CLEAN: $(OBJROOT)"
@ -621,12 +621,8 @@ all-program: $(EXETARGET) post-exe
$(call split_install_messages, any, !NetSurf/Resources) $(call split_install_messages, any, !NetSurf/Resources)
.PHONY: testament .PHONY: testament
testament utils/testament.h: testament $(OBJROOT)/testament.h:
$(Q)if test -d .svn; then \ $(Q)$(PERL) utils/git-testament.pl $(CURDIR) $(OBJROOT)/testament.h
$(PERL) utils/svn-testament.pl $(CURDIR) utils/testament.h; \
else \
$(PERL) utils/git-testament.pl $(CURDIR) utils/testament.h; \
fi
post-exe: $(POSTEXES) post-exe: $(POSTEXES)

View File

@ -5,4 +5,4 @@ S_FETCHERS := curl.c data.c file.c about.c resource.c
S_FETCHERS := $(addprefix content/fetchers/,$(S_FETCHERS)) S_FETCHERS := $(addprefix content/fetchers/,$(S_FETCHERS))
# The following files depend on the testament # The following files depend on the testament
content/fetchers/about.c: testament utils/testament.h content/fetchers/about.c: testament $(OBJROOT)/testament.h

View File

@ -41,6 +41,8 @@
#include <libwapcaplet/libwapcaplet.h> #include <libwapcaplet/libwapcaplet.h>
#include "testament.h"
#include "utils/config.h" #include "utils/config.h"
#include "content/dirlist.h" #include "content/dirlist.h"
#include "content/fetch.h" #include "content/fetch.h"
@ -54,7 +56,6 @@
#include "utils/url.h" #include "utils/url.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/ring.h" #include "utils/ring.h"
#include "utils/testament.h"
#include "image/image_cache.h" #include "image/image_cache.h"
struct fetch_about_context; struct fetch_about_context;

View File

@ -8,7 +8,7 @@ S_DESKTOP := cookie_manager.c knockout.c hotlist.c mouse.c \
S_DESKTOP := $(addprefix desktop/,$(S_DESKTOP)) S_DESKTOP := $(addprefix desktop/,$(S_DESKTOP))
# version.c needs the testament # 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 # S_BROWSER are sources related to full browsers but are common
# between RISC OS, GTK, BeOS and AmigaOS builds # between RISC OS, GTK, BeOS and AmigaOS builds

View File

@ -1,4 +1,4 @@
#include "utils/testament.h" #include "testament.h"
const char * const netsurf_version = "3.1 (Dev" const char * const netsurf_version = "3.1 (Dev"
#if defined(CI_BUILD) #if defined(CI_BUILD)