[Scummvm-git-logs] scummvm master -> 37bb3abce47c27981c2c18a15210a85e3ac29987

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
37bb3abce4 TESTS: Revert changes to module Makefile


Commit: 37bb3abce47c27981c2c18a15210a85e3ac29987
    https://github.com/scummvm/scummvm/commit/37bb3abce47c27981c2c18a15210a85e3ac29987
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-23T21:34:47+01:00

Commit Message:
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.

Changed paths:
    test/module.mk


diff --git a/test/module.mk b/test/module.mk
index e630ee8..b4cc519 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: