3 files changed, 14 insertions, 81 deletions
diff --git a/cpp/test/Ice/exceptions/.gitignore b/cpp/test/Ice/exceptions/.gitignore
deleted file mode 100644
index 725fdbfe47e..00000000000
--- a/cpp/test/Ice/exceptions/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-client
-server
-serveramd
-collocated
-.depend
-Test.cpp
-TestAMD.cpp
-Test.h
-TestAMD.h
diff --git a/cpp/test/Ice/exceptions/Makefile b/cpp/test/Ice/exceptions/Makefile
deleted file mode 100644
index 5ed083b73a4..00000000000
--- a/cpp/test/Ice/exceptions/Makefile
+++ /dev/null
@@ -1,68 +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)
-SERVERAMD	= $(call mktestname,serveramd)
-COLLOCATED	= $(call mktestname,collocated)
-
-TARGETS		= $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
-
-SLICE_OBJS	= Test.o TestAMD.o
-
-COMMON_OBJS	= ExceptionsI.o
-
-COBJS		= $(COMMON_OBJS) \
-		  Test.o \
-		  Client.o \
-		  AllTests.o
-
-SOBJS		= $(COMMON_OBJS) \
-		  Test.o \
-		  TestI.o \
-		  Server.o
-
-SAMDOBJS	= $(COMMON_OBJS) \
-		  TestAMD.o \
-		  TestAMDI.o \
-		  ServerAMD.o
-
-COLOBJS		= $(COMMON_OBJS) \
-		  Test.o \
-		  TestI.o \
-		  Collocated.o \
-		  AllTests.o
-
-OBJS		= $(COBJS) \
-		  $(SOBJS) \
-		  $(SAMDOBJS) \
-		  $(COLOBJS)
-
-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))
-
-$(SERVERAMD): $(SAMDOBJS)
-	rm -f $@
-	$(call mktest,$@,$(SAMDOBJS),$(TEST_LIBS))
-
-$(COLLOCATED): $(COLOBJS)
-	rm -f $@
-	$(call mktest,$@,$(COLOBJS),$(TEST_LIBS))
diff --git a/cpp/test/Ice/exceptions/Makefile.mk b/cpp/test/Ice/exceptions/Makefile.mk
new file mode 100644
index 00000000000..d63a17b5e4a
--- /dev/null
+++ b/cpp/test/Ice/exceptions/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)_client_sources = $(test-client-sources) ExceptionsI.cpp
+$(test)_server_sources = $(test-server-sources) ExceptionsI.cpp
+$(test)_serveramd_sources = $(test-serveramd-sources) ExceptionsI.cpp
+
+tests += $(test)
+\ No newline at end of file