From 37bb3abce47c27981c2c18a15210a85e3ac29987 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 23 Jan 2017 21:34:47 +0100 Subject: TESTS: Revert changes to module Makefile The recent changes were made in attempt to fix the test building for NDS target, but since we're not building tests there, these changes are reverted for the sake of cleaner code. --- test/module.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/module.mk b/test/module.mk index e630ee8671..b4cc519e86 100644 --- a/test/module.mk +++ b/test/module.mk @@ -43,14 +43,8 @@ endif test: test/runner ./test/runner -test/runner: test/runner.o $(TEST_LIBS) - $(QUIET_LINK)$(LD) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ $+ $(TEST_LDFLAGS) -test/runner.cpp: $(TESTS) - @mkdir -p test - $(srcdir)/test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+ -test/runner.o: test/runner.cpp - $(QUIET_CXX)$(CXX) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -c $(<) -o $@ - +test/runner: test/runner.cpp $(TEST_LIBS) + $(QUIET_CXX)$(CXX) $(TEST_CXXFLAGS) $(CPPFLAGS) $(TEST_CFLAGS) -o $@ $+ $(TEST_LDFLAGS) clean: clean-test clean-test: -- cgit v1.2.3