summaryrefslogtreecommitdiff
path: root/cpp/test/IceStorm
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-05-09 19:30:54 -0400
committerBernard Normier <bernard@zeroc.com>2016-05-09 19:30:54 -0400
commitdb4206bee14d8cd4e53e82e2848ae8cbc1cb47a2 (patch)
tree2c534974d2fa0c302c8fada7f55c1c92cc5414e0 /cpp/test/IceStorm
parentConflict fixes from previous commit (diff)
downloadice-db4206bee14d8cd4e53e82e2848ae8cbc1cb47a2.tar.bz2
ice-db4206bee14d8cd4e53e82e2848ae8cbc1cb47a2.tar.xz
ice-db4206bee14d8cd4e53e82e2848ae8cbc1cb47a2.zip
Removed libIceUtil and libSlice
Diffstat (limited to 'cpp/test/IceStorm')
-rw-r--r--cpp/test/IceStorm/federation/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/federation2/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/rep1/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/repgrid/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/repstress/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/single/Makefile.mk2
-rw-r--r--cpp/test/IceStorm/stress/Makefile.mk2
7 files changed, 7 insertions, 7 deletions
diff --git a/cpp/test/IceStorm/federation/Makefile.mk b/cpp/test/IceStorm/federation/Makefile.mk
index de316f2bbda..8d735359c70 100644
--- a/cpp/test/IceStorm/federation/Makefile.mk
+++ b/cpp/test/IceStorm/federation/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Event.ice
$(test)_subscriber_sources = Subscriber.cpp Event.ice
diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk
index 012bbe6da48..9315d0a6a59 100644
--- a/cpp/test/IceStorm/federation2/Makefile.mk
+++ b/cpp/test/IceStorm/federation2/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Event.ice
$(test)_subscriber_sources = Subscriber.cpp Event.ice
diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk
index 5155cc324f6..aba2205cdaa 100644
--- a/cpp/test/IceStorm/rep1/Makefile.mk
+++ b/cpp/test/IceStorm/rep1/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber sub
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Single.ice
$(test)_subscriber_sources = Subscriber.cpp Single.ice
diff --git a/cpp/test/IceStorm/repgrid/Makefile.mk b/cpp/test/IceStorm/repgrid/Makefile.mk
index 437b6c6b36f..a6bd78d5e33 100644
--- a/cpp/test/IceStorm/repgrid/Makefile.mk
+++ b/cpp/test/IceStorm/repgrid/Makefile.mk
@@ -7,7 +7,7 @@
#
# **********************************************************************
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_client_sources = Client.cpp Single.ice
diff --git a/cpp/test/IceStorm/repstress/Makefile.mk b/cpp/test/IceStorm/repstress/Makefile.mk
index 63d03c56fb7..1dade11fe2d 100644
--- a/cpp/test/IceStorm/repstress/Makefile.mk
+++ b/cpp/test/IceStorm/repstress/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber control
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Single.ice Controller.ice
$(test)_subscriber_sources = Subscriber.cpp Single.ice Controller.ice
diff --git a/cpp/test/IceStorm/single/Makefile.mk b/cpp/test/IceStorm/single/Makefile.mk
index 60694e4883d..2ed64d34d89 100644
--- a/cpp/test/IceStorm/single/Makefile.mk
+++ b/cpp/test/IceStorm/single/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Single.ice
$(test)_subscriber_sources = Subscriber.cpp Single.ice
diff --git a/cpp/test/IceStorm/stress/Makefile.mk b/cpp/test/IceStorm/stress/Makefile.mk
index 96cfdfccc30..cbd00e516bb 100644
--- a/cpp/test/IceStorm/stress/Makefile.mk
+++ b/cpp/test/IceStorm/stress/Makefile.mk
@@ -8,7 +8,7 @@
# **********************************************************************
$(test)_programs = publisher subscriber
-$(test)_dependencies = IceStorm Ice IceUtil TestCommon
+$(test)_dependencies = IceStorm Ice TestCommon
$(test)_publisher_sources = Publisher.cpp Event.ice
$(test)_subscriber_sources = Subscriber.cpp Event.ice