13 files changed, 45 insertions, 6 deletions
diff --git a/cpp/demo/Freeze/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak
index 6921a54e234..1ccd227fbb5 100644
--- a/cpp/demo/Freeze/library/Makefile.mak
+++ b/cpp/demo/Freeze/library/Makefile.mak
@@ -87,13 +87,12 @@ Grammar.cpp Grammar.h: Grammar.y
 	del /q Grammar.output
 
 clean::
-	del /q LibraryTypes.h LibraryTypes.cpp
-
-clean::
 	del /q Library.cpp Library.h
 
 clean::
+	del /q LibraryTypes.h LibraryTypes.cpp
 	del /q Grammar.cpp Grammar.h
 	del /q Scanner.cpp
+	for %f in (db\*) do if not %f == db\.gitignore del /q %f
 
 !include .depend
diff --git a/cpp/demo/Freeze/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak
index a32bb906902..df124deefbe 100644
--- a/cpp/demo/Freeze/phonebook/Makefile.mak
+++ b/cpp/demo/Freeze/phonebook/Makefile.mak
@@ -86,13 +86,12 @@ Grammar.cpp Grammar.h: Grammar.y
 	del /q Grammar.output
 
 clean::
-	del /q NameIndex.h NameIndex.cpp
-
-clean::
 	del /q PhoneBook.cpp PhoneBook.h
 
 clean::
+	del /q NameIndex.h NameIndex.cpp
 	del /q Grammar.cpp Grammar.h
 	del /q Scanner.cpp
+	for %f in (db\*) do if not %f == db\.gitignore del /q %f
 
 !include .depend
diff --git a/cpp/demo/IceGrid/allocate/Makefile.mak b/cpp/demo/IceGrid/allocate/Makefile.mak
index 97394ae1650..2bf2f4846b6 100644
--- a/cpp/demo/IceGrid/allocate/Makefile.mak
+++ b/cpp/demo/IceGrid/allocate/Makefile.mak
@@ -48,4 +48,8 @@ $(SERVER): $(OBJS) $(SOBJS)
 clean::
 	-del /q Hello.cpp Hello.h
 
+clean::
+	for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
+	for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
+
 !include .depend
diff --git a/cpp/demo/IceGrid/replication/Makefile.mak b/cpp/demo/IceGrid/replication/Makefile.mak
index 7a55f38431a..2c0d29ea602 100644
--- a/cpp/demo/IceGrid/replication/Makefile.mak
+++ b/cpp/demo/IceGrid/replication/Makefile.mak
@@ -48,4 +48,11 @@ $(SERVER): $(OBJS) $(SOBJS)
 clean::
 	del /q Hello.cpp Hello.h
 
+clean::
+	for %d in (master replica1 replica2) do \
+	  for %f in (db\%d\*) do if not %f == db\%d\.gitignore del /q %f
+        for %d in (node1 node2) do \
+	  for %f in (db\%d\*) do if not %f == db\%d\.gitignore del /q %f
+	  for %f in (distrib servers tmp) do if exist db\%d\%f rmdir /s /q db\%d\%f
+
 !include .depend
diff --git a/cpp/demo/IceGrid/sessionActivation/Makefile.mak b/cpp/demo/IceGrid/sessionActivation/Makefile.mak
index 08a00dce72d..6ff4ab6bcdd 100644
--- a/cpp/demo/IceGrid/sessionActivation/Makefile.mak
+++ b/cpp/demo/IceGrid/sessionActivation/Makefile.mak
@@ -48,4 +48,8 @@ $(SERVER): $(OBJS) $(SOBJS)
 clean::
 	del /q Hello.cpp Hello.h
 
+clean::
+	for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
+	for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
+
 !include .depend
diff --git a/cpp/demo/IceGrid/simple/Makefile.mak b/cpp/demo/IceGrid/simple/Makefile.mak
index 7a55f38431a..6223ab774e9 100644
--- a/cpp/demo/IceGrid/simple/Makefile.mak
+++ b/cpp/demo/IceGrid/simple/Makefile.mak
@@ -48,4 +48,8 @@ $(SERVER): $(OBJS) $(SOBJS)
 clean::
 	del /q Hello.cpp Hello.h
 
+clean::
+	for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
+	for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
+
 !include .depend
diff --git a/cpp/demo/IceStorm/clock/Makefile b/cpp/demo/IceStorm/clock/Makefile
index 61b48ef8902..01cffa11b74 100644
--- a/cpp/demo/IceStorm/clock/Makefile
+++ b/cpp/demo/IceStorm/clock/Makefile
@@ -39,4 +39,7 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
 
+clean::
+	-rm -f db/*
+
 include .depend
diff --git a/cpp/demo/IceStorm/clock/Makefile.mak b/cpp/demo/IceStorm/clock/Makefile.mak
index b2d74f1ae32..9e2e021db1d 100644
--- a/cpp/demo/IceStorm/clock/Makefile.mak
+++ b/cpp/demo/IceStorm/clock/Makefile.mak
@@ -48,4 +48,7 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS)
 clean::
 	del /q Clock.cpp Clock.h
 
+clean::
+	for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
 !include .depend
diff --git a/cpp/demo/IceStorm/counter/Makefile b/cpp/demo/IceStorm/counter/Makefile
index b26a1c2acb7..bff4bd7e573 100644
--- a/cpp/demo/IceStorm/counter/Makefile
+++ b/cpp/demo/IceStorm/counter/Makefile
@@ -41,4 +41,7 @@ $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(IS_LIBS)
 
+clean::
+	-rm -f db/*
+
 include .depend
diff --git a/cpp/demo/IceStorm/counter/Makefile.mak b/cpp/demo/IceStorm/counter/Makefile.mak
index d5965f59982..7b9e6a0161f 100644
--- a/cpp/demo/IceStorm/counter/Makefile.mak
+++ b/cpp/demo/IceStorm/counter/Makefile.mak
@@ -50,4 +50,7 @@ $(SERVER): $(OBJS) $(SOBJS)
 clean::
 	del /q Counter.cpp Counter.h
 
+clean::
+	for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
 !include .depend
diff --git a/cpp/demo/IceStorm/replicated/Makefile b/cpp/demo/IceStorm/replicated/Makefile
index 02330cc5133..c67d2e15287 100644
--- a/cpp/demo/IceStorm/replicated/Makefile
+++ b/cpp/demo/IceStorm/replicated/Makefile
@@ -39,4 +39,7 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
 
+clean::
+	-rm -rf db/node/* db/registry/*
+
 include .depend
diff --git a/cpp/demo/IceStorm/replicated/Makefile.mak b/cpp/demo/IceStorm/replicated/Makefile.mak
index 91103c5ffe7..1e88cc7acce 100644
--- a/cpp/demo/IceStorm/replicated/Makefile.mak
+++ b/cpp/demo/IceStorm/replicated/Makefile.mak
@@ -48,4 +48,8 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS)
 clean::
 	del /q Clock.cpp Clock.h
 
+clean::
+	for %f in (db\registry\*) do if not %f == db\registry\.gitignore del /q %f
+	for %f in (distrib servers tmp) do if exist db\node\%f rmdir /s /q db\node\%f
+
 !include .depend
diff --git a/cpp/demo/book/freeze_filesystem/Makefile.mak b/cpp/demo/book/freeze_filesystem/Makefile.mak
index f464b53fb9a..9bce3d76618 100644
--- a/cpp/demo/book/freeze_filesystem/Makefile.mak
+++ b/cpp/demo/book/freeze_filesystem/Makefile.mak
@@ -51,4 +51,7 @@ clean::
 	del /q Filesystem.cpp Filesystem.h
 	del /q PersistentFilesystem.cpp PersistentFilesystem.h
 
+clean::
+	for %f in (db\*) do if not %f == db\.gitignore del /q %f
+
 !include .depend