summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/Make.rules.Darwin3
-rw-r--r--cpp/test/IceGrid/Makefile13
-rw-r--r--cpp/test/IceGrid/fileLock/Makefile16
3 files changed, 31 insertions, 1 deletions
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index 63b9fde83bd..c801d50fa7f 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -49,6 +49,9 @@ endif
#
CXXLIBS =
+clean::
+ rm -f *.keychain *.fl*
+
#
# If embedded_runpath is not set to yes we do not add
# an rpath dir.
diff --git a/cpp/test/IceGrid/Makefile b/cpp/test/IceGrid/Makefile
index da0126b2964..70122bc3f64 100644
--- a/cpp/test/IceGrid/Makefile
+++ b/cpp/test/IceGrid/Makefile
@@ -12,7 +12,18 @@ top_srcdir = ../..
include $(top_srcdir)/config/Make.rules
-SUBDIRS = simple deployer session update noRestartUpdate activation replicaGroup allocation replication distribution admin
+SUBDIRS = simple \
+ deployer \
+ session \
+ update \
+ noRestartUpdate \
+ activation \
+ replicaGroup \
+ allocation \
+ replication \
+ distribution \
+ admin \
+ fileLock
.PHONY: $(EVERYTHING) $(SUBDIRS)
diff --git a/cpp/test/IceGrid/fileLock/Makefile b/cpp/test/IceGrid/fileLock/Makefile
new file mode 100644
index 00000000000..a96fd2d9988
--- /dev/null
+++ b/cpp/test/IceGrid/fileLock/Makefile
@@ -0,0 +1,16 @@
+# **********************************************************************
+#
+# 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.
+#
+# **********************************************************************
+
+top_srcdir = ../../..
+
+include $(top_srcdir)/config/Make.rules
+
+clean::
+ -rm -rf db/node db/registry db/replica-*
+ -rm -rf db/*