summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@netsurf-browser.org>2009-02-14 11:12:22 +0000
committerDaniel Silverstone <dsilvers@netsurf-browser.org>2009-02-14 11:12:22 +0000
commit4456645b451300aff4a763e966746e247ec5ae39 (patch)
tree0e2d93b749e073e79336601a0aee6c3306456960 /build
parent472d9ed91f2e43642edd7ae92269b76a293e004e (diff)
downloadlibhubbub-4456645b451300aff4a763e966746e247ec5ae39.tar.gz
libhubbub-4456645b451300aff4a763e966746e247ec5ae39.tar.bz2
Allow TESTTYPE=release to be specified to build the tests with the release CFLAGS.
Add TARGET to the build paths. You should 'make distclean' before updating to this. Add BUILD_SHARED=yes support to the *nix build svn path=/trunk/hubbub/; revision=6478
Diffstat (limited to 'build')
-rw-r--r--build/Makefile.common11
1 files changed, 6 insertions, 5 deletions
diff --git a/build/Makefile.common b/build/Makefile.common
index 65158ad..74948d5 100644
--- a/build/Makefile.common
+++ b/build/Makefile.common
@@ -9,10 +9,11 @@ COMPONENT := libhubbub
# Environment
TOP ?= $(CURDIR)
EXPORT := $(TOP)/dist
-RELEASEDIR := build/Release
-DEBUGDIR := build/Debug
-COVERAGEDIR := build/coverage
-DOCDIR := build/docs
+RELEASEDIR := build/Release-$(TARGET)
+DEBUGDIR := build/Debug-$(TARGET)
+COVERAGEDIR := build/coverage-$(TARGET)
+DOCDIR := build/docs-$(TARGET)
+TESTTYPE ?= debug
# List of items to delete on clean
ITEMS_CLEAN :=
@@ -53,7 +54,7 @@ debug: setup $(addprefix $(DEBUGDIR)/,$(OBJECTS))
@$(AR) $(ARFLAGS) $(COMPONENT)-debug.a \
$(addprefix $(DEBUGDIR)/,$(OBJECTS))
-test: debug $(TARGET_TESTS)
+test: $(TESTTYPE) $(TARGET_TESTS)
coverage: clean
@$(LCOV) --directory . --zerocounters