5 files changed, 6 insertions, 9 deletions
diff --git a/cpp/demo/Ice/plugin/.gitignore b/cpp/demo/Ice/plugin/.gitignore
index c8ca8d89cb9..2195b2c868c 100644
--- a/cpp/demo/Ice/plugin/.gitignore
+++ b/cpp/demo/Ice/plugin/.gitignore
@@ -3,9 +3,7 @@
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
 server
-libLoggerPlugin.so
-libLoggerPlugin.so.34
-libHelloPlugin.so
-libHelloPlugin.so.34
+libLoggerPlugin.*
+libHelloPlugin.*
 Hello.cpp
 Hello.h
diff --git a/cpp/demo/IceBox/hello/.gitignore b/cpp/demo/IceBox/hello/.gitignore
index 20a7b29a4a9..eecf1d6c204 100644
--- a/cpp/demo/IceBox/hello/.gitignore
+++ b/cpp/demo/IceBox/hello/.gitignore
@@ -2,6 +2,6 @@
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
-libHelloService.so
+libHelloService.*
 Hello.cpp
 Hello.h
diff --git a/cpp/demo/IceGrid/icebox/.gitignore b/cpp/demo/IceGrid/icebox/.gitignore
index 2169402e345..ee30c50ee81 100644
--- a/cpp/demo/IceGrid/icebox/.gitignore
+++ b/cpp/demo/IceGrid/icebox/.gitignore
@@ -2,7 +2,7 @@
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
-libHelloService.so
+libHelloService.*
 Hello.cpp
 Hello.h
 db/node/*
diff --git a/cpp/demo/IceGrid/secure/.gitignore b/cpp/demo/IceGrid/secure/.gitignore
index ebb4189ea80..8e835bbc3ed 100644
--- a/cpp/demo/IceGrid/secure/.gitignore
+++ b/cpp/demo/IceGrid/secure/.gitignore
@@ -5,8 +5,7 @@ client
 server
 Hello.cpp
 Hello.h
-db/registry/*
-db/node/*
 db/master/*
 db/slave/*
+db/node/*
 certs/*
diff --git a/cpp/demo/IceGrid/secure/Makefile b/cpp/demo/IceGrid/secure/Makefile
index d5a3c124913..123d592821e 100644
--- a/cpp/demo/IceGrid/secure/Makefile
+++ b/cpp/demo/IceGrid/secure/Makefile
@@ -40,6 +40,6 @@ $(SERVER): $(OBJS) $(SOBJS)
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
 
 clean::
-	-rm -rf db/registry/* db/node/* certs/*
+	-rm -rf db/master/* db/slave/* db/node/* certs/*
 
 include .depend