mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-15 08:42:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

rename default build output directory target

Browse Source
This commit is contained in:
Vincent Sanders 2017-01-05 23:00:41 +00:00
parent 047b37d5f8
commit 2d9ed9cbc4
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -16,10 +16,6 @@ frontends/gtk/res/fr/Messages
frontends/gtk/res/de/Messages
frontends/gtk/res/nl/Messages
frontends/gtk/res/it/Messages
test/nsoption
test/nsurl
test/urldbtest
test/llcache
codedocs
nsgtk
nsfb
@ -34,4 +30,4 @@ NetSurf.dmg
NetSurf
core
nsfb-*
build-*
build

2
Makefile
View File

@ -344,7 +344,7 @@ endif
CC := $(CCACHE) $(CC)
# Target paths
OBJROOT = build-$(HOST)-$(TARGET)$(SUBTARGET)
OBJROOT = build/$(HOST)-$(TARGET)$(SUBTARGET)
DEPROOT := $(OBJROOT)/deps
TOOLROOT := $(OBJROOT)/tools

9
test/Makefile
View File

@ -58,15 +58,16 @@ utils_SRCS := utils/utils.c utils/messages.c utils/hashtable.c \
time_SRCS := utils/time.c test/log.c test/time.c
# Coverage builds need additional flags
COV_ROOT := build/$(HOST)-coverage
ifeq ($(MAKECMDGOALS),coverage)
COV_CFLAGS ?= -fprofile-arcs -ftest-coverage -O0
COV_CXXFLAGS ?= -fprofile-arcs -ftest-coverage -O0
COV_LDFLAGS ?= -lgcov -fprofile-arcs
TESTROOT := build-$(HOST)-coverage
TESTROOT := $(COV_ROOT)
else
COV_CFLAGS ?= -O0
COV_CXXFLAGS ?= -O0
TESTROOT := build-$(HOST)-test
TESTROOT := build/$(HOST)-test
endif
@ -172,6 +173,6 @@ $(TESTROOT)/created:
test-clean:
$(VQ)echo " CLEAN: $(TESTROOT)"
$(VQ)echo " CLEAN: build-$(HOST)-coverage"
$(Q)$(RM) -r $(TESTROOT) build-$(HOST)-coverage
$(VQ)echo " CLEAN: $(COV_ROOT)"
$(Q)$(RM) -r $(TESTROOT) $(COV_ROOT)
CLEANS += test-clean