3 files changed, 12 insertions, 41 deletions
diff --git a/cpp/test/IceUtil/thread/.gitignore b/cpp/test/IceUtil/thread/.gitignore
deleted file mode 100644
index f715a76859d..00000000000
--- a/cpp/test/IceUtil/thread/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-client
-.depend
diff --git a/cpp/test/IceUtil/thread/Makefile b/cpp/test/IceUtil/thread/Makefile
deleted file mode 100644
index 62b7c89ae91..00000000000
--- a/cpp/test/IceUtil/thread/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-top_srcdir	= ../../..
-
-CLIENT		= $(call mktestname,client)
-
-TARGETS		= $(CLIENT)
-
-OBJS		= TestBase.o \
-		  CreateTest.o \
-		  AliveTest.o \
-		  StartTest.o \
-		  SleepTest.o \
-		  RecMutexTest.o \
-		  MutexTest.o \
-		  MonitorMutexTest.o \
-		  MonitorRecMutexTest.o \
-		  CountDownLatchTest.o \
-		  TestSuite.o \
-		  Client.o
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
-
-$(CLIENT): $(OBJS)
-	rm -f $@
-	$(call mktest,$@,$(OBJS),$(BASELIBS))
diff --git a/cpp/test/IceUtil/thread/Makefile.mk b/cpp/test/IceUtil/thread/Makefile.mk
new file mode 100644
index 00000000000..904c9e358d1
--- /dev/null
+++ b/cpp/test/IceUtil/thread/Makefile.mk
@@ -0,0 +1,12 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(test)_client_sources := $(notdir $(wildcard $(currentdir)/*.cpp))
+
+tests += $(test)