summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--Makefile2
-rw-r--r--test/Makefile9
3 files changed, 7 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index b16d6f977..35de191c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/Makefile b/Makefile
index 2596e7af6..77ab0629a 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/test/Makefile b/test/Makefile
index a3f84f35a..7a763e943 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -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