3 files changed, 15 insertions, 51 deletions
diff --git a/cpp/test/IceBox/configuration/.gitignore b/cpp/test/IceBox/configuration/.gitignore
deleted file mode 100644
index 03484b5178b..00000000000
--- a/cpp/test/IceBox/configuration/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-client
-libTestService.*
-.depend
-Test.cpp
-Test.h
diff --git a/cpp/test/IceBox/configuration/Makefile b/cpp/test/IceBox/configuration/Makefile
deleted file mode 100644
index b7a0d13b9b4..00000000000
--- a/cpp/test/IceBox/configuration/Makefile
+++ /dev/null
@@ -1,42 +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		= client
-
-SVCFILENAME     = $(call mklibfilename,TestService)
-SVCSONAME	= $(call mksoname,TestService)
-
-TARGETS		= $(CLIENT) $(SVCFILENAME)
-
-SLICE_OBJS	= Test.o \
-
-COBJS		= $(SLICE_OBJS) \
-		  Client.o \
-		  AllTests.o
-
-SERVICE_OBJS	= $(SLICE_OBJS) \
-		  TestI.o \
-		  Service.o
-
-OBJS		= $(COBJS) \
-		  $(SERVICE_OBJS) \
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
-
-$(CLIENT): $(COBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS)
-
-$(SVCFILENAME): $(SERVICE_OBJS)
-	rm -f $@
-	$(call mkshlib,$@,$(SVCSONAME),$(SERVICE_OBJS), -lIceBox $(LIBS))
diff --git a/cpp/test/IceBox/configuration/Makefile.mk b/cpp/test/IceBox/configuration/Makefile.mk
new file mode 100644
index 00000000000..6cd4d36590c
--- /dev/null
+++ b/cpp/test/IceBox/configuration/Makefile.mk
@@ -0,0 +1,15 @@
+# **********************************************************************
+#
+# 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)_libraries := $(test)_TestService
+
+$(test)_TestService_sources         = TestI.cpp Service.cpp Test.ice
+$(test)_TestService_dependencies    = IceBox
+
+tests += $(test)