summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/stringConverter
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/Ice/stringConverter')
-rw-r--r--cpp/test/Ice/stringConverter/.gitignore9
-rw-r--r--cpp/test/Ice/stringConverter/Makefile40
-rw-r--r--cpp/test/Ice/stringConverter/Makefile.mk12
3 files changed, 12 insertions, 49 deletions
diff --git a/cpp/test/Ice/stringConverter/.gitignore b/cpp/test/Ice/stringConverter/.gitignore
deleted file mode 100644
index 3a3aae35bd8..00000000000
--- a/cpp/test/Ice/stringConverter/.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
-server
-.depend
-Test.cpp
-Test.h
diff --git a/cpp/test/Ice/stringConverter/Makefile b/cpp/test/Ice/stringConverter/Makefile
deleted file mode 100644
index 9df661b03a5..00000000000
--- a/cpp/test/Ice/stringConverter/Makefile
+++ /dev/null
@@ -1,40 +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)
-
-TARGETS = $(CLIENT) $(SERVER)
-
-SLICE_OBJS = Test.o
-
-COBJS = $(SLICE_OBJS) \
- Client.o
-
-SOBJS = $(SLICE_OBJS) \
- Server.o
-
-OBJS = $(COBJS) \
- $(SOBJS)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS := -I. -I../../include $(CPPFLAGS)
-
-LINKWITH := $(TEST_LIBS) $(ICONV_LIBS)
-
-$(CLIENT): $(COBJS)
- rm -f $@
- $(call mktest,$@,$(COBJS),$(LINKWITH))
-
-$(SERVER): $(SOBJS)
- rm -f $@
- $(call mktest,$@,$(SOBJS),$(LINKWITH))
diff --git a/cpp/test/Ice/stringConverter/Makefile.mk b/cpp/test/Ice/stringConverter/Makefile.mk
new file mode 100644
index 00000000000..d7a508574e2
--- /dev/null
+++ b/cpp/test/Ice/stringConverter/Makefile.mk
@@ -0,0 +1,12 @@
+# **********************************************************************
+#
+# 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)_libs = iconv
+
+tests += $(test) \ No newline at end of file