From 5c30c56085b267796f2bc56690e2beaf8f9557a4 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 3 May 2006 08:54:00 +0000 Subject: Moved all of the test targets to the new tests directory, make life easier. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 45b2a03..1add784 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ OBJS:=$(patsubst %.cpp,%.o,$(wildcard src/*.cpp)) TOBJS:=$(patsubst %.cpp,%.o,$(wildcard src/test/*.cpp)) TDIRS:=$(filter-out %.o %.cpp %.h %.d,$(wildcard src/test/*)) -TESTS:=$(patsubst src/test/%.o,%,$(TOBJS)) $(patsubst src/test/%,%,$(TDIRS)) +TESTS:=$(patsubst src/test/%.o,tests/%,$(TOBJS)) $(patsubst src/test/%,tests/%,$(TDIRS)) ATOBJS:=$(TOBJS) $(patsubst %.cpp,%.o,$(foreach dr,$(TDIRS),$(wildcard $(dr)/*.cpp))) LIB:=libbu++.a DATE:=$(shell date +%F) @@ -39,7 +39,7 @@ $(LIB): $(OBJS) $(TESTS): $(ATOBJS) $(LIB) echo "$(TXTLNK)$@" - g++ $(LDFLAGS) -ggdb $(filter %$@.o, $(TOBJS) ) $(patsubst %.cpp,%.o,$(wildcard $(filter %$@, $(TDIRS))/*.cpp)) -L. -lbu++ -o $@ + g++ $(LDFLAGS) -ggdb $(filter %$(patsubst tests/%,%,$@).o, $(TOBJS) ) $(patsubst %.cpp,%.o,$(wildcard $(filter %$(patsubst tests/%,%,$@), $(TDIRS))/*.cpp)) -L. -lbu++ -o $@ tests: $(TESTS) -- cgit v1.2.3