summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/Freeze/customEvictor/.gitignore2
-rw-r--r--cpp/demo/Freeze/customEvictor/Makefile4
-rw-r--r--cpp/test/IceGrid/deployer/.gitignore1
-rw-r--r--cpp/test/IceGrid/deployer/Makefile1
-rw-r--r--cpp/test/IceGrid/replicaGroup/.gitignore1
-rw-r--r--cpp/test/IceGrid/replicaGroup/Makefile1
-rw-r--r--cpp/test/IceGrid/replication/.gitignore1
-rw-r--r--cpp/test/IceGrid/replication/Makefile1
-rw-r--r--cpp/test/IceStorm/federation/Makefile1
-rw-r--r--cpp/test/IceStorm/single/.gitignore1
-rw-r--r--cpp/test/IceStorm/single/Makefile1
-rw-r--r--cpp/test/IceStorm/stress/.gitignore1
-rw-r--r--cpp/test/IceStorm/stress/Makefile1
13 files changed, 14 insertions, 3 deletions
diff --git a/cpp/demo/Freeze/customEvictor/.gitignore b/cpp/demo/Freeze/customEvictor/.gitignore
index 492898bca1d..3ccc6280245 100644
--- a/cpp/demo/Freeze/customEvictor/.gitignore
+++ b/cpp/demo/Freeze/customEvictor/.gitignore
@@ -4,3 +4,5 @@ Item.cpp
ItemInfo.cpp
Item.h
ItemInfo.h
+Database.h
+Database.cpp
diff --git a/cpp/demo/Freeze/customEvictor/Makefile b/cpp/demo/Freeze/customEvictor/Makefile
index 5800bf47ebb..61867fc12bc 100644
--- a/cpp/demo/Freeze/customEvictor/Makefile
+++ b/cpp/demo/Freeze/customEvictor/Makefile
@@ -49,10 +49,8 @@ Database.h Database.cpp: ItemInfo.ice $(SLICE2FREEZE)
rm -f Database.h Database.cpp
$(SLICE2FREEZE) -I$(slicedir) --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
-cleandb:
+clean::
-rm -rf db/__* db/items db/log*
-
-clean:: cleandb
-rm -f Database.h Database.cpp
include .depend
diff --git a/cpp/test/IceGrid/deployer/.gitignore b/cpp/test/IceGrid/deployer/.gitignore
index 2a7e6e49099..2dd5070a2ef 100644
--- a/cpp/test/IceGrid/deployer/.gitignore
+++ b/cpp/test/IceGrid/deployer/.gitignore
@@ -3,3 +3,4 @@ server
libTestService.dylib
Test.cpp
Test.h
+build.txt
diff --git a/cpp/test/IceGrid/deployer/Makefile b/cpp/test/IceGrid/deployer/Makefile
index ba47f47c591..f5490b65e9c 100644
--- a/cpp/test/IceGrid/deployer/Makefile
+++ b/cpp/test/IceGrid/deployer/Makefile
@@ -53,6 +53,7 @@ $(SVCFILENAME): $(OBJS) $(SERVICE_OBJS)
$(call mkshlib,$@,$(SVCSONAME),$(OBJS) $(SERVICE_OBJS), $(DB_RPATH_LINK) -lFreeze $(LINKWITH))
clean::
+ -rm -f build.txt
-rm -rf db/node db/registry
include .depend
diff --git a/cpp/test/IceGrid/replicaGroup/.gitignore b/cpp/test/IceGrid/replicaGroup/.gitignore
index 2a7e6e49099..2dd5070a2ef 100644
--- a/cpp/test/IceGrid/replicaGroup/.gitignore
+++ b/cpp/test/IceGrid/replicaGroup/.gitignore
@@ -3,3 +3,4 @@ server
libTestService.dylib
Test.cpp
Test.h
+build.txt
diff --git a/cpp/test/IceGrid/replicaGroup/Makefile b/cpp/test/IceGrid/replicaGroup/Makefile
index bb2e0f9d092..125de1fa48d 100644
--- a/cpp/test/IceGrid/replicaGroup/Makefile
+++ b/cpp/test/IceGrid/replicaGroup/Makefile
@@ -53,6 +53,7 @@ $(SVCFILENAME): $(OBJS) $(SERVICE_OBJS)
$(call mkshlib,$@,$(SVCSONAME),$(OBJS) $(SERVICE_OBJS),$(LINKWITH))
clean::
+ -rm -f build.txt
-rm -rf db/node db/registry
include .depend
diff --git a/cpp/test/IceGrid/replication/.gitignore b/cpp/test/IceGrid/replication/.gitignore
index 30d5d1b9929..f129074cee5 100644
--- a/cpp/test/IceGrid/replication/.gitignore
+++ b/cpp/test/IceGrid/replication/.gitignore
@@ -2,3 +2,4 @@ client
server
Test.cpp
Test.h
+build.txt
diff --git a/cpp/test/IceGrid/replication/Makefile b/cpp/test/IceGrid/replication/Makefile
index 9d688459d90..04420c13aa1 100644
--- a/cpp/test/IceGrid/replication/Makefile
+++ b/cpp/test/IceGrid/replication/Makefile
@@ -42,6 +42,7 @@ $(SERVER): $(OBJS) $(SOBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
clean::
+ -rm -f build.txt
-rm -rf db/node db/registry
include .depend
diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile
index cca39d866c0..37b4235a862 100644
--- a/cpp/test/IceStorm/federation/Makefile
+++ b/cpp/test/IceStorm/federation/Makefile
@@ -40,6 +40,7 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
clean::
+ -rm build.txt
-rm -f db/*
include .depend
diff --git a/cpp/test/IceStorm/single/.gitignore b/cpp/test/IceStorm/single/.gitignore
index 4f621650b54..18c76971d42 100644
--- a/cpp/test/IceStorm/single/.gitignore
+++ b/cpp/test/IceStorm/single/.gitignore
@@ -2,3 +2,4 @@ publisher
subscriber
Single.cpp
Single.h
+build.txt
diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile
index fa1975ad53f..21c880eb62d 100644
--- a/cpp/test/IceStorm/single/Makefile
+++ b/cpp/test/IceStorm/single/Makefile
@@ -40,6 +40,7 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
clean::
+ -rm -f build.txt
-rm -f db/*
include .depend
diff --git a/cpp/test/IceStorm/stress/.gitignore b/cpp/test/IceStorm/stress/.gitignore
index dcd55d76efa..1ac307f15b1 100644
--- a/cpp/test/IceStorm/stress/.gitignore
+++ b/cpp/test/IceStorm/stress/.gitignore
@@ -2,3 +2,4 @@ publisher
subscriber
Event.cpp
Event.h
+build.txt
diff --git a/cpp/test/IceStorm/stress/Makefile b/cpp/test/IceStorm/stress/Makefile
index cca39d866c0..ffd69dcf3c4 100644
--- a/cpp/test/IceStorm/stress/Makefile
+++ b/cpp/test/IceStorm/stress/Makefile
@@ -40,6 +40,7 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS)
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
clean::
+ -rm -f build.txt
-rm -f db/*
include .depend