3 files changed, 17 insertions, 66 deletions
diff --git a/cpp/test/IceGrid/allocation/.gitignore b/cpp/test/IceGrid/allocation/.gitignore
deleted file mode 100644
index b38ad0a165c..00000000000
--- a/cpp/test/IceGrid/allocation/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-.depend
-client
-server
-verifier
-.depend
-Test.cpp
-Test.h
-db/node
-db/registry
-db/node-1
-db/node-2
-db/replica-*
diff --git a/cpp/test/IceGrid/allocation/Makefile b/cpp/test/IceGrid/allocation/Makefile
deleted file mode 100644
index df6b8a017cf..00000000000
--- a/cpp/test/IceGrid/allocation/Makefile
+++ /dev/null
@@ -1,51 +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
-SERVER		= server
-VERIFIER	= verifier
-
-TARGETS		= $(CLIENT) $(SERVER) $(VERIFIER)
-
-SLICE_OBJS	= Test.o
-
-COBJS		= $(SLICE_OBJS) \
-		  Client.o \
-		  AllTests.o
-
-SOBJS		= $(SLICE_OBJS) \
-		  TestI.o \
-		  Server.o
-
-VOBJS		= PermissionsVerifier.o
-
-OBJS		= $(COBJS) \
-		  $(SOBJS) \
-		  $(VOBJS)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
-
-$(CLIENT): $(COBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS)
-
-$(SERVER): $(SOBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS)
-
-$(VERIFIER): $(VOBJS)
-	rm -f $@
-	$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(VOBJS) -lGlacier2 $(LIBS)
-
-clean::
-	-rm -rf db/node db/registry db/node-1 db/node-2 db/replica-*
diff --git a/cpp/test/IceGrid/allocation/Makefile.mk b/cpp/test/IceGrid/allocation/Makefile.mk
new file mode 100644
index 00000000000..1652a427cf5
--- /dev/null
+++ b/cpp/test/IceGrid/allocation/Makefile.mk
@@ -0,0 +1,17 @@
+# **********************************************************************
+#
+# 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 verifier
+
+$(test)_client_dependencies = IceGrid Glacier2
+
+$(test)_verifier_sources = PermissionsVerifier.cpp
+$(test)_verifier_dependencies = Glacier2
+
+tests += $(test)
+\ No newline at end of file