From 6d87251d26ad28efc8dfc9d1710c63a13974550f Mon Sep 17 00:00:00 2001 From: nyamatongwe Date: Sun, 13 Feb 2011 10:08:42 +1100 Subject: Avoid unnecessary relinks on Windows. --- test/unit/makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/unit/makefile b/test/unit/makefile index c83169e4d..35a6fd0ce 100644 --- a/test/unit/makefile +++ b/test/unit/makefile @@ -12,6 +12,7 @@ DEL = del /q CPPFLAGS += -I$(GTEST_DIR)/include GTEST_ALL = gtest-all.o LINKFLAGS = $(CPPFLAGS) $(CXXFLAGS) +EXE = unitTest.exe else @@ -19,6 +20,7 @@ DEL = rm -f CPPFLAGS = $(shell gtest-config --cppflags) CXXFLAGS = $(shell gtest-config --cxxflags) LINKFLAGS = $(shell gtest-config --ldflags --libs) +EXE = unitTest # For coverage testing with gcov #CPPFLAGS += -fprofile-arcs -ftest-coverage @@ -42,7 +44,7 @@ CXXFLAGS += -g -Wall -Wextra -Wno-unused-function CASES:=$(addsuffix .o,$(basename $(notdir $(wildcard test*.cxx)))) TESTEDOBJS=ContractionState.o RunStyles.o -TESTS=unitTest +TESTS=$(EXE) GTEST_HEADERS=$(GTEST_DIR)/include/gtest/*.h $(GTEST_DIR)/include/gtest/internal/*.h @@ -62,5 +64,5 @@ gtest-all.o: $(GTEST_SRCS_) .cxx.o: $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -unitTest: $(CASES) $(TESTEDOBJS) unitTest.o $(GTEST_ALL) +$(EXE): $(CASES) $(TESTEDOBJS) unitTest.o $(GTEST_ALL) $(CXX) $(LINKFLAGS) $^ -o $@ -- cgit v1.2.3