diff options
Diffstat (limited to 'cpp')
53 files changed, 71 insertions, 124 deletions
diff --git a/cpp/demo/Database/Oracle/occi/Makefile b/cpp/demo/Database/Oracle/occi/Makefile index 5c0244466cb..ac5afd915fe 100644 --- a/cpp/demo/Database/Oracle/occi/Makefile +++ b/cpp/demo/Database/Oracle/occi/Makefile @@ -54,7 +54,7 @@ DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ: DbTypes.typ attraccess=private clean:: - rm -f DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ + -rm -f DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ include .depend diff --git a/cpp/demo/Database/Oracle/proc/Makefile b/cpp/demo/Database/Oracle/proc/Makefile index ae0829f9273..236cd26ca89 100644 --- a/cpp/demo/Database/Oracle/proc/Makefile +++ b/cpp/demo/Database/Oracle/proc/Makefile @@ -62,6 +62,6 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(ORACLE_LIBS) $(LIBS) clean:: - rm -f $(GENERATED_PROC_FILES) + -rm -f $(GENERATED_PROC_FILES) include .depend diff --git a/cpp/demo/Freeze/backup/Makefile b/cpp/demo/Freeze/backup/Makefile index 235e1ff1a46..6d53e2a1a14 100644 --- a/cpp/demo/Freeze/backup/Makefile +++ b/cpp/demo/Freeze/backup/Makefile @@ -32,8 +32,8 @@ IntLongMap.h IntLongMap.cpp: $(SLICE2FREEZE) $(SLICE2FREEZE) -I$(slicedir) --dict IntLongMap,int,long IntLongMap clean:: - rm -f IntLongMap.h IntLongMap.cpp - rm -f db/data/IntLongMap db/data/__catalog db/logs/log.* db/__db.* - rm -rf hotbackup hotbackup.1 + -rm -f IntLongMap.h IntLongMap.cpp + -rm -f db/data/* db/logs/* + -rm -rf hotbackup hotbackup.1 include .depend diff --git a/cpp/demo/Freeze/backup/db/data/.gitignore b/cpp/demo/Freeze/backup/db/data/.gitignore index f5f2100eabc..72e8ffc0db8 100644 --- a/cpp/demo/Freeze/backup/db/data/.gitignore +++ b/cpp/demo/Freeze/backup/db/data/.gitignore @@ -1,2 +1 @@ -IntLongMap -__catalog +* diff --git a/cpp/demo/Freeze/backup/db/logs/.gitignore b/cpp/demo/Freeze/backup/db/logs/.gitignore index 80a243fa817..72e8ffc0db8 100644 --- a/cpp/demo/Freeze/backup/db/logs/.gitignore +++ b/cpp/demo/Freeze/backup/db/logs/.gitignore @@ -1 +1 @@ -log.* +* diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile index f8e97300cff..ec3e6c047ae 100644 --- a/cpp/demo/Freeze/bench/Makefile +++ b/cpp/demo/Freeze/bench/Makefile @@ -41,6 +41,7 @@ BenchTypes.h BenchTypes.cpp: Test.ice $(SLICE2FREEZE) BenchTypes Test.ice clean:: - rm -f BenchTypes.h BenchTypes.cpp + -rm -f db/* + -rm -f BenchTypes.h BenchTypes.cpp include .depend diff --git a/cpp/demo/Freeze/customEvictor/Makefile b/cpp/demo/Freeze/customEvictor/Makefile index 337fc7b5d86..5800bf47ebb 100644 --- a/cpp/demo/Freeze/customEvictor/Makefile +++ b/cpp/demo/Freeze/customEvictor/Makefile @@ -45,15 +45,14 @@ $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) - 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: - rm -f db/log.* db/__catalog db/items + -rm -rf db/__* db/items db/log* clean:: cleandb - rm -f Database.h Database.cpp + -rm -f Database.h Database.cpp include .depend diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile index 7af18a62a02..c624425d048 100644 --- a/cpp/demo/Freeze/library/Makefile +++ b/cpp/demo/Freeze/library/Makefile @@ -66,10 +66,9 @@ LibraryTypes.h LibraryTypes.cpp: Library.ice $(SLICE2FREEZE) $(SLICE2FREEZE) --ice -I$(slicedir) --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes $(slicedir)/Ice/BuiltinSequences.ice Library.ice clean:: - rm -f LibraryTypes.h LibraryTypes.cpp - -clean:: - rm -f Grammar.cpp Grammar.h - rm -f Scanner.cpp + -rm -f db/* + -rm -f LibraryTypes.h LibraryTypes.cpp + -rm -f Grammar.cpp Grammar.h + -rm -f Scanner.cpp include .depend diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile index 6216543539b..44e7c46f2da 100644 --- a/cpp/demo/Freeze/phonebook/Makefile +++ b/cpp/demo/Freeze/phonebook/Makefile @@ -66,11 +66,9 @@ NameIndex.h NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE) $(SLICE2FREEZE) $(ICECPPFLAGS) --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice clean:: - rm -f NameIndex.h NameIndex.cpp - -clean:: - rm -f Grammar.cpp Grammar.h - rm -f Scanner.cpp - rm -f db/contacts db/log* + -rm -f NameIndex.h NameIndex.cpp + -rm -f Grammar.cpp Grammar.h + -rm -f Scanner.cpp + -rm -f db/* include .depend diff --git a/cpp/demo/Freeze/phonebook/db/.gitignore b/cpp/demo/Freeze/phonebook/db/.gitignore index 62894f31ae4..72e8ffc0db8 100644 --- a/cpp/demo/Freeze/phonebook/db/.gitignore +++ b/cpp/demo/Freeze/phonebook/db/.gitignore @@ -1,2 +1 @@ -contacts -log* +* diff --git a/cpp/demo/book/freeze_filesystem/Makefile b/cpp/demo/book/freeze_filesystem/Makefile index 880cf9f4e12..252c12918dd 100644 --- a/cpp/demo/book/freeze_filesystem/Makefile +++ b/cpp/demo/book/freeze_filesystem/Makefile @@ -43,7 +43,8 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: - rm -f Grammar.cpp Grammar.h - rm -f Scanner.cpp + -rm -f db/* + -rm -f Grammar.cpp Grammar.h + -rm -f Scanner.cpp include .depend diff --git a/cpp/demo/book/printer/.gitignore b/cpp/demo/book/printer/.gitignore index 1c0875f53bb..a98474c3634 100644 --- a/cpp/demo/book/printer/.gitignore +++ b/cpp/demo/book/printer/.gitignore @@ -2,12 +2,3 @@ client server Printer.cpp Printer.h -Printer.cpp -Printer.h -r -Debug -Release -*.opt -*.plg -*.ncb -*.vcproj diff --git a/cpp/demo/book/printer/Makefile b/cpp/demo/book/printer/Makefile index f3d4613977e..599ac568654 100755 --- a/cpp/demo/book/printer/Makefile +++ b/cpp/demo/book/printer/Makefile @@ -46,8 +46,4 @@ $(SLICE_GEN): $(SLICE_SRCS) $(SLICE2CPP) test:: -clean:: - rm -f $(SLICE_GEN) - rm -fr Debug Release *.opt *.plg *.ncb *.vcproj - include .depend diff --git a/cpp/demo/book/simple_filesystem/.gitignore b/cpp/demo/book/simple_filesystem/.gitignore index a8c3d41e0dd..f10df2ed737 100644 --- a/cpp/demo/book/simple_filesystem/.gitignore +++ b/cpp/demo/book/simple_filesystem/.gitignore @@ -2,12 +2,3 @@ client server Filesystem.cpp Filesystem.h -Filesystem.cpp -Filesystem.h -r -Debug -Release -*.opt -*.plg -*.ncb -*.vcproj diff --git a/cpp/demo/book/simple_filesystem/Makefile b/cpp/demo/book/simple_filesystem/Makefile index 1c13ede2864..aa18061b968 100755 --- a/cpp/demo/book/simple_filesystem/Makefile +++ b/cpp/demo/book/simple_filesystem/Makefile @@ -46,8 +46,4 @@ $(SLICE_GEN): $(SLICE_SRCS) $(SLICE2CPP) test:: -clean:: - rm -f $(SLICE_GEN) - rm -fr Debug Release *.opt *.plg *.ncb *.vcproj - include .depend diff --git a/cpp/doc/Makefile b/cpp/doc/Makefile index 3ac4a85cc72..9fd7c4464a1 100644 --- a/cpp/doc/Makefile +++ b/cpp/doc/Makefile @@ -36,7 +36,7 @@ reference/index.html: $(SLICEFILES) cp $(JAVASCRIPT) reference clean:: - rm -rf reference + -rm -rf reference/* install:: @if test -f reference/index.html ; \ diff --git a/cpp/doc/reference/.dummy b/cpp/doc/reference/.dummy new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/cpp/doc/reference/.dummy diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile index 5034fd1d397..f4257c2040e 100644 --- a/cpp/src/Freeze/Makefile +++ b/cpp/src/Freeze/Makefile @@ -76,8 +76,7 @@ $(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice mv Catalog.h $(HDIR)/Catalog.h clean:: - rm -f $(HDIR)/Catalog.h Catalog.cpp - + -rm -f $(HDIR)/Catalog.h Catalog.cpp $(libdir)/$(LIBFILENAME): $(OBJS) rm -f $@ diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile index 7416d736e18..d6d1a723704 100644 --- a/cpp/src/FreezeScript/Makefile +++ b/cpp/src/FreezeScript/Makefile @@ -51,8 +51,8 @@ $(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) $(CXX) $(LDFLAGS) -o $@ $(DUMP_OBJS) $(COMMON_OBJS) -lSlice $(EXPAT_RPATH_LINK) -lIceXML $(DB_RPATH_LINK) -lFreeze $(LIBS) $(DB_LIBS) clean:: - rm -f Grammar.cpp Grammar.h - rm -f Scanner.cpp + -rm -f Grammar.cpp Grammar.h + -rm -f Scanner.cpp install:: all $(call installprogram,$(TRANSFORMDB),$(install_bindir)) diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 8a0bf9dc85a..c474115b075 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -167,7 +167,7 @@ $(LOCAL_HDIR)/StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE StringApplicationInfoDict $(LOCAL_SDIR)/Internal.ice clean:: - rm -f StringApplicationInfoDict.h StringApplicationInfoDict.cpp + -rm -f StringApplicationInfoDict.h StringApplicationInfoDict.cpp $(LOCAL_HDIR)/IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZE) rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index d9b54c01f6d..e227f8f47af 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -99,13 +99,11 @@ PersistentTopicMap.h PersistentTopicMap.cpp: ../IceStorm/LinkRecord.ice $(sliced $(SLICE2FREEZECMD) --dict IceStorm::PersistentTopicMap,Ice::Identity,IceStorm::LinkRecordSeq \ PersistentTopicMap ../IceStorm/LinkRecord.ice -clean:: - rm -f PersistentTopicMap.h PersistentTopicMap.cpp - # Needed for make -jn to work. ../IceStorm/Grammar.y: Grammar.h clean:: + -rm -f PersistentTopicMap.h PersistentTopicMap.cpp -rm -f Grammar.cpp Grammar.h -rm -f Scanner.cpp diff --git a/cpp/src/Slice/Makefile b/cpp/src/Slice/Makefile index c2d0d653559..c3e4fa7e867 100644 --- a/cpp/src/Slice/Makefile +++ b/cpp/src/Slice/Makefile @@ -60,8 +60,8 @@ endif .NOTPARALLEL: clean:: - rm -f Grammar.cpp Grammar.h - rm -f Scanner.cpp + -rm -f Grammar.cpp Grammar.h + -rm -f Scanner.cpp install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) diff --git a/cpp/src/icecpp/Makefile b/cpp/src/icecpp/Makefile index 0cb1f045adb..d7a54655318 100644 --- a/cpp/src/icecpp/Makefile +++ b/cpp/src/icecpp/Makefile @@ -32,4 +32,4 @@ install:: all $(call installprogram,$(NAME),$(install_bindir)) clean:: - rm -f cexp.c + -rm -f cexp.c diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile index dd588fbe656..8b9e0446443 100644 --- a/cpp/test/Freeze/complex/Makefile +++ b/cpp/test/Freeze/complex/Makefile @@ -37,13 +37,9 @@ ComplexDict.h ComplexDict.cpp: Complex.ice $(SLICE2FREEZE) $(SLICE2FREEZE) -I$(slicedir) --dict Complex::ComplexDict,Complex::Key,Complex::Node ComplexDict Complex.ice clean:: - rm -f ComplexDict.h ComplexDict.cpp - -clean:: - rm -f Grammar.cpp Grammar.h - rm -f Scanner.cpp - -clean:: - rm -f db/test db/log.* + -rm -f ComplexDict.h ComplexDict.cpp + -rm -f Grammar.cpp Grammar.h + -rm -f Scanner.cpp + -rm -f db/* include .depend diff --git a/cpp/test/Freeze/complex/db/.gitignore b/cpp/test/Freeze/complex/db/.gitignore index 549220c101c..72e8ffc0db8 100644 --- a/cpp/test/Freeze/complex/db/.gitignore +++ b/cpp/test/Freeze/complex/db/.gitignore @@ -1,2 +1 @@ -test -log.* +* diff --git a/cpp/test/Freeze/dbmap/Makefile b/cpp/test/Freeze/dbmap/Makefile index 12e67817e03..c45ee479011 100644 --- a/cpp/test/Freeze/dbmap/Makefile +++ b/cpp/test/Freeze/dbmap/Makefile @@ -51,9 +51,11 @@ WstringWstringMap.h WstringWstringMap.cpp: $(SLICE2FREEZE) $(SLICE2FREEZE) --dict 'Test::WstringWstringMap,["cpp:type:wstring"]string,["cpp:type:wstring"]string' --dict-index Test::WstringWstringMap WstringWstringMap clean:: - rm -f ByteIntMap.h ByteIntMap.cpp IntIdentityMap.h IntIdentityMap.cpp IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp SortedMap.h SortedMap.cpp WstringWstringMap.h WstringWstringMap.cpp - -clean:: - rm -f db/binary db/binary.* db/intIdentity db/intIdentity.* db/__catalog db/log.* + -rm -f ByteIntMap.h ByteIntMap.cpp + -rm -f IntIdentityMap.h IntIdentityMap.cpp + -rm -f IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp + -rm -f SortedMap.h SortedMap.cpp + -rm -f WstringWstringMap.h WstringWstringMap.cpp + -rm -f db/* include .depend diff --git a/cpp/test/Freeze/dbmap/db/.gitignore b/cpp/test/Freeze/dbmap/db/.gitignore index 724e973b4b5..72e8ffc0db8 100644 --- a/cpp/test/Freeze/dbmap/db/.gitignore +++ b/cpp/test/Freeze/dbmap/db/.gitignore @@ -1,6 +1 @@ -binary -binary.* -intIdentity -intIdentity.* -__catalog -log.* +* diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile index 6afc22d5980..bbda8b0ec61 100644 --- a/cpp/test/Freeze/evictor/Makefile +++ b/cpp/test/Freeze/evictor/Makefile @@ -40,6 +40,6 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: - rm -f db/Test db/log.* + -rm -f db/* include .depend diff --git a/cpp/test/Freeze/evictor/db/.gitignore b/cpp/test/Freeze/evictor/db/.gitignore index 4e1629c0203..72e8ffc0db8 100644 --- a/cpp/test/Freeze/evictor/db/.gitignore +++ b/cpp/test/Freeze/evictor/db/.gitignore @@ -1,2 +1 @@ -Test -log.* +* diff --git a/cpp/test/Freeze/oldevictor/Makefile b/cpp/test/Freeze/oldevictor/Makefile index 6afc22d5980..bbda8b0ec61 100644 --- a/cpp/test/Freeze/oldevictor/Makefile +++ b/cpp/test/Freeze/oldevictor/Makefile @@ -40,6 +40,6 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: - rm -f db/Test db/log.* + -rm -f db/* include .depend diff --git a/cpp/test/Freeze/oldevictor/db/.gitignore b/cpp/test/Freeze/oldevictor/db/.gitignore index 4e1629c0203..72e8ffc0db8 100644 --- a/cpp/test/Freeze/oldevictor/db/.gitignore +++ b/cpp/test/Freeze/oldevictor/db/.gitignore @@ -1,2 +1 @@ -Test -log.* +* diff --git a/cpp/test/FreezeScript/dbmap/Makefile b/cpp/test/FreezeScript/dbmap/Makefile index 579a6da93ef..6d414a06018 100644 --- a/cpp/test/FreezeScript/dbmap/Makefile +++ b/cpp/test/FreezeScript/dbmap/Makefile @@ -34,9 +34,7 @@ IntSMap.h IntSMap.cpp: $(SLICE2FREEZE) $(SLICE2FREEZE) --dict IntSMap,int,::Test::S IntSMap TestOld.ice clean:: - rm -f IntSMap.h IntSMap.cpp - -clean:: - rm -f db/*.db db/log.* db/__catalog + -rm -f IntSMap.h IntSMap.cpp + -rm -f db/* include .depend diff --git a/cpp/test/FreezeScript/dbmap/db/.gitignore b/cpp/test/FreezeScript/dbmap/db/.gitignore index 7f74507e6ed..72e8ffc0db8 100644 --- a/cpp/test/FreezeScript/dbmap/db/.gitignore +++ b/cpp/test/FreezeScript/dbmap/db/.gitignore @@ -1,3 +1 @@ -*.db -log.* -__catalog +* diff --git a/cpp/test/FreezeScript/evictor/Makefile b/cpp/test/FreezeScript/evictor/Makefile index 3adfbd69439..8453798e1e7 100644 --- a/cpp/test/FreezeScript/evictor/Makefile +++ b/cpp/test/FreezeScript/evictor/Makefile @@ -29,6 +29,6 @@ $(CLIENT): $(OBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: - rm -f db/*.db db/log.* db/__catalog + -rm -f db/* include .depend diff --git a/cpp/test/FreezeScript/evictor/db/.gitignore b/cpp/test/FreezeScript/evictor/db/.gitignore index 7f74507e6ed..72e8ffc0db8 100644 --- a/cpp/test/FreezeScript/evictor/db/.gitignore +++ b/cpp/test/FreezeScript/evictor/db/.gitignore @@ -1,3 +1 @@ -*.db -log.* -__catalog +* diff --git a/cpp/test/Ice/gc/Makefile b/cpp/test/Ice/gc/Makefile index 70d30770bf9..74ba669fa4a 100644 --- a/cpp/test/Ice/gc/Makefile +++ b/cpp/test/Ice/gc/Makefile @@ -31,6 +31,6 @@ $(CLIENT): $(OBJS) $(COBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LIBS) clean:: - rm -f seed + -rm -f seed include .depend diff --git a/cpp/test/IceGrid/activation/Makefile b/cpp/test/IceGrid/activation/Makefile index f489d11cd50..88619cb16cf 100644 --- a/cpp/test/IceGrid/activation/Makefile +++ b/cpp/test/IceGrid/activation/Makefile @@ -41,6 +41,6 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) clean:: - rm -rf db/node db/registry + -rm -rf db/node db/registry include .depend diff --git a/cpp/test/IceGrid/allocation/Makefile b/cpp/test/IceGrid/allocation/Makefile index e1ab0f28589..cc7ad235cc6 100644 --- a/cpp/test/IceGrid/allocation/Makefile +++ b/cpp/test/IceGrid/allocation/Makefile @@ -50,6 +50,6 @@ $(VERIFIER): $(VOBJS) $(CXX) $(LDFLAGS) -o $@ $(VOBJS) -lGlacier2 $(LIBS) clean:: - rm -rf db/node db/registry db/node-1 db/node-2 + -rm -rf db/node db/registry db/node-1 db/node-2 include .depend diff --git a/cpp/test/IceGrid/deployer/Makefile b/cpp/test/IceGrid/deployer/Makefile index ba138d9c395..ba47f47c591 100644 --- a/cpp/test/IceGrid/deployer/Makefile +++ b/cpp/test/IceGrid/deployer/Makefile @@ -53,6 +53,6 @@ $(SVCFILENAME): $(OBJS) $(SERVICE_OBJS) $(call mkshlib,$@,$(SVCSONAME),$(OBJS) $(SERVICE_OBJS), $(DB_RPATH_LINK) -lFreeze $(LINKWITH)) clean:: - rm -rf db/node db/registry + -rm -rf db/node db/registry include .depend diff --git a/cpp/test/IceGrid/distribution/Makefile b/cpp/test/IceGrid/distribution/Makefile index cb1cf110faf..f9395889bc3 100644 --- a/cpp/test/IceGrid/distribution/Makefile +++ b/cpp/test/IceGrid/distribution/Makefile @@ -42,6 +42,6 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) clean:: - rm -rf db/node db/registry db/node-1 db/node-2 + -rm -rf db/node db/registry db/node-1 db/node-2 include .depend diff --git a/cpp/test/IceGrid/replicaGroup/Makefile b/cpp/test/IceGrid/replicaGroup/Makefile index c8fc18b622b..bb2e0f9d092 100644 --- a/cpp/test/IceGrid/replicaGroup/Makefile +++ b/cpp/test/IceGrid/replicaGroup/Makefile @@ -53,6 +53,6 @@ $(SVCFILENAME): $(OBJS) $(SERVICE_OBJS) $(call mkshlib,$@,$(SVCSONAME),$(OBJS) $(SERVICE_OBJS),$(LINKWITH)) clean:: - rm -rf db/node db/registry + -rm -rf db/node db/registry include .depend diff --git a/cpp/test/IceGrid/replication/Makefile b/cpp/test/IceGrid/replication/Makefile index 0bc64f416bb..9d688459d90 100644 --- a/cpp/test/IceGrid/replication/Makefile +++ b/cpp/test/IceGrid/replication/Makefile @@ -42,6 +42,6 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) clean:: - rm -rf db/node db/registry + -rm -rf db/node db/registry include .depend diff --git a/cpp/test/IceGrid/session/Makefile b/cpp/test/IceGrid/session/Makefile index 5143a3e5d4d..53a57ff072f 100644 --- a/cpp/test/IceGrid/session/Makefile +++ b/cpp/test/IceGrid/session/Makefile @@ -44,6 +44,6 @@ $(SERVER): $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier2 -lIceSSL $(LIBS) $(OPENSSL_RPATH_LINK) clean:: - rm -rf db/node db/registry db/node-1 + -rm -rf db/node db/registry db/node-1 include .depend diff --git a/cpp/test/IceGrid/simple/Makefile b/cpp/test/IceGrid/simple/Makefile index f489d11cd50..88619cb16cf 100644 --- a/cpp/test/IceGrid/simple/Makefile +++ b/cpp/test/IceGrid/simple/Makefile @@ -41,6 +41,6 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) clean:: - rm -rf db/node db/registry + -rm -rf db/node db/registry include .depend diff --git a/cpp/test/IceGrid/update/Makefile b/cpp/test/IceGrid/update/Makefile index cb1cf110faf..f9395889bc3 100644 --- a/cpp/test/IceGrid/update/Makefile +++ b/cpp/test/IceGrid/update/Makefile @@ -42,6 +42,6 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) clean:: - rm -rf db/node db/registry db/node-1 db/node-2 + -rm -rf db/node db/registry db/node-1 db/node-2 include .depend diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile index 9a203ab1cc4..cca39d866c0 100644 --- a/cpp/test/IceStorm/federation/Makefile +++ b/cpp/test/IceStorm/federation/Makefile @@ -40,6 +40,6 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) clean:: - rm -f db/topicmanager db/log.* + -rm -f db/* include .depend diff --git a/cpp/test/IceStorm/federation/db/.gitignore b/cpp/test/IceStorm/federation/db/.gitignore index c7d60044095..72e8ffc0db8 100644 --- a/cpp/test/IceStorm/federation/db/.gitignore +++ b/cpp/test/IceStorm/federation/db/.gitignore @@ -1,2 +1 @@ -topicmanager -log.* +* diff --git a/cpp/test/IceStorm/federation2/Makefile b/cpp/test/IceStorm/federation2/Makefile index 9a203ab1cc4..cca39d866c0 100644 --- a/cpp/test/IceStorm/federation2/Makefile +++ b/cpp/test/IceStorm/federation2/Makefile @@ -40,6 +40,6 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) clean:: - rm -f db/topicmanager db/log.* + -rm -f db/* include .depend diff --git a/cpp/test/IceStorm/federation2/db/.gitignore b/cpp/test/IceStorm/federation2/db/.gitignore index c7d60044095..72e8ffc0db8 100644 --- a/cpp/test/IceStorm/federation2/db/.gitignore +++ b/cpp/test/IceStorm/federation2/db/.gitignore @@ -1,2 +1 @@ -topicmanager -log.* +* diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile index 4886126dc5e..fa1975ad53f 100644 --- a/cpp/test/IceStorm/single/Makefile +++ b/cpp/test/IceStorm/single/Makefile @@ -40,6 +40,6 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) clean:: - rm -f db/topicmanager db/log.* + -rm -f db/* include .depend diff --git a/cpp/test/IceStorm/single/db/.gitignore b/cpp/test/IceStorm/single/db/.gitignore index c7d60044095..72e8ffc0db8 100644 --- a/cpp/test/IceStorm/single/db/.gitignore +++ b/cpp/test/IceStorm/single/db/.gitignore @@ -1,2 +1 @@ -topicmanager -log.* +* diff --git a/cpp/test/IceStorm/stress/Makefile b/cpp/test/IceStorm/stress/Makefile index 9a203ab1cc4..cca39d866c0 100644 --- a/cpp/test/IceStorm/stress/Makefile +++ b/cpp/test/IceStorm/stress/Makefile @@ -40,6 +40,6 @@ $(SUBSCRIBER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) clean:: - rm -f db/topicmanager db/log.* + -rm -f db/* include .depend diff --git a/cpp/test/IceStorm/stress/db/.gitignore b/cpp/test/IceStorm/stress/db/.gitignore index c7d60044095..72e8ffc0db8 100644 --- a/cpp/test/IceStorm/stress/db/.gitignore +++ b/cpp/test/IceStorm/stress/db/.gitignore @@ -1,2 +1 @@ -topicmanager -log.* +* |