aboutsummaryrefslogtreecommitdiff
path: root/src/test/Makefile.nmake
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-12-17 16:41:01 -0500
committerNick Mathewson <nickm@torproject.org>2018-12-17 16:41:01 -0500
commite969d9c6b4b82178fbc840e3d53e12cbb64fee5c (patch)
tree5be34da1967f5358ed84c816c86a4bce7d656a0e /src/test/Makefile.nmake
parent5a22b42c3a01ad8d99e977cfd9efa760438129e9 (diff)
parentc8b8b15f0eb2651dea694a057e70e6b8c34dbe05 (diff)
downloadtor-e969d9c6b4b82178fbc840e3d53e12cbb64fee5c.tar.gz
tor-e969d9c6b4b82178fbc840e3d53e12cbb64fee5c.zip
Merge branch 'ticket28179_squashed' into ticket28179_squashed_merged
Diffstat (limited to 'src/test/Makefile.nmake')
-rw-r--r--src/test/Makefile.nmake7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake
index cfbe281b94..aa16a22b52 100644
--- a/src/test/Makefile.nmake
+++ b/src/test/Makefile.nmake
@@ -1,4 +1,4 @@
-all: test.exe test-child.exe bench.exe
+all: test.exe bench.exe
CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or \
/I ..\ext
@@ -30,8 +30,5 @@ test.exe: $(TEST_OBJECTS)
bench.exe: bench.obj
$(CC) $(CFLAGS) bench.obj $(LIBS) ..\common\*.lib /Fe$@
-test-child.exe: test-child.obj
- $(CC) $(CFLAGS) test-child.obj /Fe$@
-
clean:
- del *.obj *.lib test.exe bench.exe test-child.exe
+ del *.obj *.lib test.exe bench.exe