From 4456645b451300aff4a763e966746e247ec5ae39 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sat, 14 Feb 2009 11:12:22 +0000 Subject: 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 --- build/Makefile.common | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'build') 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 -- cgit v1.2.3