3 files changed, 19 insertions, 68 deletions
diff --git a/cpp/test/IceStorm/rep1/.gitignore b/cpp/test/IceStorm/rep1/.gitignore
deleted file mode 100644
index 9cd9b7ec547..00000000000
--- a/cpp/test/IceStorm/rep1/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-publisher
-subscriber
-sub
-.depend
-Single.cpp
-Single.h
-build.txt
-0.db/*
-1.db/*
-2.db/*
diff --git a/cpp/test/IceStorm/rep1/Makefile b/cpp/test/IceStorm/rep1/Makefile
deleted file mode 100644
index eb010ab56c7..00000000000
--- a/cpp/test/IceStorm/rep1/Makefile
+++ /dev/null
@@ -1,54 +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	= ../../..
-
-PUBLISHER	= publisher
-SUBSCRIBER	= subscriber
-SUB		= sub
-
-TARGETS		= $(PUBLISHER) $(SUBSCRIBER) $(SUB)
-
-SLICE_OBJS	= Single.o
-
-POBJS		= $(SLICE_OBJS) \
-		  Publisher.o
-
-SOBJS		= $(SLICE_OBJS) \
-		  Subscriber.o
-
-SUB_OBJS	= $(SLICE_OBJS) \
-		  Sub.o
-
-OBJS		= $(SUB_OBJS) \
-		  $(POBJS) \
-		  $(SOBJS)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
-LIBS		:= -lIceStorm $(LIBS)
-
-$(PUBLISHER): $(POBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS)
-
-$(SUBSCRIBER): $(SOBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS)
-
-$(SUB): $(SUB_OBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SUB_OBJS) $(LIBS)
-
-clean::
-	-rm -f build.txt
-	-rm -rf 0.db/*
-	-rm -rf 1.db/*
-	-rm -rf 2.db/*
diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk
new file mode 100644
index 00000000000..5155cc324f6
--- /dev/null
+++ b/cpp/test/IceStorm/rep1/Makefile.mk
@@ -0,0 +1,19 @@
+# **********************************************************************
+#
+# 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 	= publisher subscriber sub
+$(test)_dependencies 	= IceStorm Ice IceUtil TestCommon
+
+$(test)_publisher_sources 	= Publisher.cpp Single.ice
+$(test)_subscriber_sources 	= Subscriber.cpp Single.ice
+$(test)_sub_sources 		= Sub.cpp Single.ice
+
+$(test)_cleanfiles = 0.db/* 1.db/* 2.db/*
+
+tests += $(test)
+\ No newline at end of file