From 9251ae7fb470a71b23adac9a6ec9c4df95eec797 Mon Sep 17 00:00:00 2001 From: Jeff Donahue Date: Tue, 18 Mar 2014 14:49:31 -0700 Subject: [PATCH] also fix for runtest --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 61186a6..e42c75e 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,8 @@ PYTHON_LDFLAGS := $(LDFLAGS) $(foreach library,$(PYTHON_LIBRARIES),-l$(library)) ############################## # Define build targets ############################## -.PHONY: all init test clean linecount lint tools examples py mat distribute py$(PROJECT) mat$(PROJECT) proto +.PHONY: all init test clean linecount lint tools examples py mat distribute \ + py$(PROJECT) mat$(PROJECT) proto runtest all: init $(NAME) $(STATIC_NAME) tools examples @echo $(CXX_OBJS) @@ -172,7 +173,7 @@ runtest: $(TEST_ALL_BIN) $(TEST_BINS): %.testbin : %.o $(GTEST_OBJ) $(STATIC_NAME) $(TEST_HDRS) $(CXX) $(TEST_MAIN_SRC) $< $(GTEST_OBJ) $(STATIC_NAME) -o $@ $(CXXFLAGS) $(LDFLAGS) $(WARNINGS) -$(TEST_ALL_BIN): $(STATIC_NAME) $(TEST_OBJS) +$(TEST_ALL_BIN): $(GTEST_OBJ) $(STATIC_NAME) $(TEST_OBJS) $(CXX) $(TEST_MAIN_SRC) $(TEST_OBJS) $(GTEST_OBJ) $(STATIC_NAME) -o $(TEST_ALL_BIN) $(CXXFLAGS) $(LDFLAGS) $(WARNINGS) $(TOOL_BINS): %.bin : %.o $(STATIC_NAME) -- 2.7.4