summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-06-14 22:59:16 +0200
committerJose <jose@zeroc.com>2016-06-14 22:59:16 +0200
commit9d7a7af0c21b2235934cc10c34138206699db310 (patch)
treec969e0848005c761aef78938ead61cf5be0dbed6 /cpp
parentFixed ICE-7134 - PHP Ice/proxy test fails on Ubuntu 16.04 (diff)
downloadice-9d7a7af0c21b2235934cc10c34138206699db310.tar.bz2
ice-9d7a7af0c21b2235934cc10c34138206699db310.tar.xz
ice-9d7a7af0c21b2235934cc10c34138206699db310.zip
Clean rules fixes
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Glacier2/attack/Makefile3
-rw-r--r--cpp/test/Glacier2/attack/Makefile.mak1
-rw-r--r--cpp/test/Glacier2/router/Makefile3
-rw-r--r--cpp/test/Glacier2/sessionHelper/Makefile3
-rw-r--r--cpp/test/Glacier2/staticFiltering/Makefile3
-rw-r--r--cpp/test/Ice/objects/Makefile2
6 files changed, 14 insertions, 1 deletions
diff --git a/cpp/test/Glacier2/attack/Makefile b/cpp/test/Glacier2/attack/Makefile
index 442a3a4e99c..e4ec459d7e4 100644
--- a/cpp/test/Glacier2/attack/Makefile
+++ b/cpp/test/Glacier2/attack/Makefile
@@ -38,3 +38,6 @@ $(CLIENT): $(COBJS)
$(SERVER): $(SOBJS)
rm -f $@
$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS)
+
+clean::
+ rm -rf passwords \ No newline at end of file
diff --git a/cpp/test/Glacier2/attack/Makefile.mak b/cpp/test/Glacier2/attack/Makefile.mak
index d965dc49a7c..a52157c8681 100644
--- a/cpp/test/Glacier2/attack/Makefile.mak
+++ b/cpp/test/Glacier2/attack/Makefile.mak
@@ -49,3 +49,4 @@ $(SERVER): $(SOBJS)
clean::
del /q Backend.cpp Backend.h
+
diff --git a/cpp/test/Glacier2/router/Makefile b/cpp/test/Glacier2/router/Makefile
index 7b1981e66d3..821278bd9e9 100644
--- a/cpp/test/Glacier2/router/Makefile
+++ b/cpp/test/Glacier2/router/Makefile
@@ -38,3 +38,6 @@ $(CLIENT): $(COBJS)
$(SERVER): $(SOBJS)
rm -f $@
$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS)
+
+clean::
+ rm -rf passwords \ No newline at end of file
diff --git a/cpp/test/Glacier2/sessionHelper/Makefile b/cpp/test/Glacier2/sessionHelper/Makefile
index 711c25eaa60..dbdc5257adc 100644
--- a/cpp/test/Glacier2/sessionHelper/Makefile
+++ b/cpp/test/Glacier2/sessionHelper/Makefile
@@ -36,3 +36,6 @@ $(CLIENT): $(COBJS)
$(SERVER): $(SOBJS)
rm -f $@
$(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS)
+
+clean::
+ rm -rf passwords \ No newline at end of file
diff --git a/cpp/test/Glacier2/staticFiltering/Makefile b/cpp/test/Glacier2/staticFiltering/Makefile
index 7463f56a978..4a6e40bd159 100644
--- a/cpp/test/Glacier2/staticFiltering/Makefile
+++ b/cpp/test/Glacier2/staticFiltering/Makefile
@@ -41,3 +41,6 @@ $(SERVER): $(SOBJS)
clean::
-rm -f attack.cfg router.cfg server.cfg
+
+clean::
+ rm -rf passwords \ No newline at end of file
diff --git a/cpp/test/Ice/objects/Makefile b/cpp/test/Ice/objects/Makefile
index 3d797a315eb..b93751549bd 100644
--- a/cpp/test/Ice/objects/Makefile
+++ b/cpp/test/Ice/objects/Makefile
@@ -14,7 +14,7 @@ SERVER = $(call mktestname,server)
COLLOCATED = $(call mktestname,collocated)
TESTLIBNAME = libTestDerived.a
-TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED)
+TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) $(TESTLIBNAME)
SLICE_OBJS = Test.o \
Derived.o \