3 files changed, 14 insertions, 60 deletions
diff --git a/cpp/test/Ice/threadPoolPriority/.gitignore b/cpp/test/Ice/threadPoolPriority/.gitignore
deleted file mode 100644
index ae1078237e7..00000000000
--- a/cpp/test/Ice/threadPoolPriority/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-client
-server
-servercustom
-.depend
-Test.cpp
-Test.h
diff --git a/cpp/test/Ice/threadPoolPriority/Makefile b/cpp/test/Ice/threadPoolPriority/Makefile
deleted file mode 100644
index 5cc9e2453fd..00000000000
--- a/cpp/test/Ice/threadPoolPriority/Makefile
+++ /dev/null
@@ -1,50 +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)
-SERVER		= $(call mktestname,server)
-SERVERCUSTOM	= $(call mktestname,servercustom)
-
-TARGETS		= $(CLIENT) $(SERVER) $(SERVERCUSTOM)
-
-SLICE_OBJS	= Test.o
-
-COBJS		= $(SLICE_OBJS) \
-		  Client.o \
-		  AllTests.o
-
-SOBJS		= $(SLICE_OBJS) \
-		  TestI.o \
-		  Server.o
-
-SCOBJS		= $(SLICE_OBJS) \
-		  ServerCustomThreadPool.o \
-		  TestI.o
-
-OBJS		= $(COBJS) \
-		  $(SOBJS) \
-		  $(SCOBJS)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
-
-$(CLIENT): $(COBJS)
-	rm -f $@
-	$(call mktest,$@,$(COBJS),$(TEST_LIBS))
-
-$(SERVER): $(SOBJS)
-	rm -f $@
-	$(call mktest,$@,$(SOBJS),$(TEST_LIBS))
-
-$(SERVERCUSTOM): $(SCOBJS)
-	rm -f $@
-	$(call mktest,$@,$(SCOBJS),$(TEST_LIBS))
diff --git a/cpp/test/Ice/threadPoolPriority/Makefile.mk b/cpp/test/Ice/threadPoolPriority/Makefile.mk
new file mode 100644
index 00000000000..9a3cc06cc3c
--- /dev/null
+++ b/cpp/test/Ice/threadPoolPriority/Makefile.mk
@@ -0,0 +1,14 @@
+# **********************************************************************
+#
+# 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)_programs := client server servercustom
+
+$(test)_servercustom_sources 	:= ServerCustomThreadPool.cpp Test.ice TestI.cpp
+
+tests += $(test)
+\ No newline at end of file