aboutsummaryrefslogtreecommitdiff
path: root/test/module.mk
diff options
context:
space:
mode:
authorEugene Sandulenko2017-01-23 21:34:47 +0100
committerEugene Sandulenko2017-01-23 21:34:47 +0100
commit37bb3abce47c27981c2c18a15210a85e3ac29987 (patch)
tree058d81c0379db0232f4519aae9774ff471eaa2e3 /test/module.mk
parent4212734b1ee39f8abd79846b05ba6d201136b4cd (diff)
downloadscummvm-rg350-37bb3abce47c27981c2c18a15210a85e3ac29987.tar.gz
scummvm-rg350-37bb3abce47c27981c2c18a15210a85e3ac29987.tar.bz2
scummvm-rg350-37bb3abce47c27981c2c18a15210a85e3ac29987.zip
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.
Diffstat (limited to 'test/module.mk')
-rw-r--r--test/module.mk10
1 files changed, 2 insertions, 8 deletions
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: