diff options
| author | Jose <jose@zeroc.com> | 2014-10-17 23:49:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-10-17 23:49:00 +0200 |
| commit | 3270752330a64428f77bd5a103e7d64486353176 (patch) | |
| tree | 1889b57d9a2ef3133877c7291823f51440c7d274 /cpp | |
| parent | fix build.xml to install IceDiscovery.jar (diff) | |
| download | ice-3270752330a64428f77bd5a103e7d64486353176.tar.bz2 ice-3270752330a64428f77bd5a103e7d64486353176.tar.xz ice-3270752330a64428f77bd5a103e7d64486353176.zip | |
Dependency fixes:
Add quotes to Windows Slice dependencies
Fix Cicular dependency issue with Make 3.82 included in rhel7,
C++ dependencies now are of type Foo.h: Foo.ice, we don't need
Foo.cpp as that always depend on Foo.h
Diffstat (limited to 'cpp')
137 files changed, 733 insertions, 734 deletions
diff --git a/cpp/demo/Freeze/bench/.depend.mak b/cpp/demo/Freeze/bench/.depend.mak index da6635d537b..2a956589a24 100644 --- a/cpp/demo/Freeze/bench/.depend.mak +++ b/cpp/demo/Freeze/bench/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/demo/Freeze/casino/.depend.mak b/cpp/demo/Freeze/casino/.depend.mak index b60fea75849..7ee523e0a3a 100644 --- a/cpp/demo/Freeze/casino/.depend.mak +++ b/cpp/demo/Freeze/casino/.depend.mak @@ -1,11 +1,11 @@ -Casino.cpp: \ +Casino.h: \ Casino.ice -CasinoStore.cpp: \ +CasinoStore.h: \ CasinoStore.ice \ ./Casino.ice \ - $(slicedir)/Ice/Identity.ice + "$(slicedir)/Ice/Identity.ice" Casino.obj: \ Casino.cpp \ diff --git a/cpp/demo/Freeze/customEvictor/.depend.mak b/cpp/demo/Freeze/customEvictor/.depend.mak index 7f467d2bb6f..ae2fe4238ec 100644 --- a/cpp/demo/Freeze/customEvictor/.depend.mak +++ b/cpp/demo/Freeze/customEvictor/.depend.mak @@ -1,8 +1,8 @@ -Item.cpp: \ +Item.h: \ Item.ice -ItemInfo.cpp: \ +ItemInfo.h: \ ItemInfo.ice Item.obj: \ diff --git a/cpp/demo/Freeze/library/.depend.mak b/cpp/demo/Freeze/library/.depend.mak index 0f7dc9c8cac..ec88b5668e7 100644 --- a/cpp/demo/Freeze/library/.depend.mak +++ b/cpp/demo/Freeze/library/.depend.mak @@ -1,5 +1,5 @@ -Library.cpp: \ +Library.h: \ Library.ice Library.obj: \ diff --git a/cpp/demo/Freeze/phonebook/.depend.mak b/cpp/demo/Freeze/phonebook/.depend.mak index f509c0d43ff..4ebb154a6ae 100644 --- a/cpp/demo/Freeze/phonebook/.depend.mak +++ b/cpp/demo/Freeze/phonebook/.depend.mak @@ -1,7 +1,7 @@ -PhoneBook.cpp: \ +PhoneBook.h: \ PhoneBook.ice \ - $(slicedir)/Ice/Identity.ice + "$(slicedir)/Ice/Identity.ice" PhoneBook.obj: \ PhoneBook.cpp \ diff --git a/cpp/demo/Freeze/transform/.depend.mak b/cpp/demo/Freeze/transform/.depend.mak index d2545c0e95d..13953337580 100644 --- a/cpp/demo/Freeze/transform/.depend.mak +++ b/cpp/demo/Freeze/transform/.depend.mak @@ -1,8 +1,8 @@ -ContactData.cpp: \ +ContactData.h: \ ContactData.ice -NewContactData.cpp: \ +NewContactData.h: \ NewContactData.ice ContactData.obj: \ diff --git a/cpp/demo/Glacier2/callback/.depend.mak b/cpp/demo/Glacier2/callback/.depend.mak index ee0815d37ed..1f785363a46 100644 --- a/cpp/demo/Glacier2/callback/.depend.mak +++ b/cpp/demo/Glacier2/callback/.depend.mak @@ -1,5 +1,5 @@ -Callback.cpp: \ +Callback.h: \ Callback.ice Callback.obj: \ diff --git a/cpp/demo/Glacier2/chat/.depend.mak b/cpp/demo/Glacier2/chat/.depend.mak index 64f14ab3b7d..38058c17479 100644 --- a/cpp/demo/Glacier2/chat/.depend.mak +++ b/cpp/demo/Glacier2/chat/.depend.mak @@ -1,10 +1,10 @@ -Chat.cpp: \ +Chat.h: \ Chat.ice \ - $(slicedir)/Glacier2/Session.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Glacier2/SSLInfo.ice + "$(slicedir)/Glacier2/Session.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" Chat.obj: \ Chat.cpp \ diff --git a/cpp/demo/Ice/MFC/client/.depend.mak b/cpp/demo/Ice/MFC/client/.depend.mak index ccaf6559e1d..50c73586a65 100644 --- a/cpp/demo/Ice/MFC/client/.depend.mak +++ b/cpp/demo/Ice/MFC/client/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/Ice/MFC/server/.depend.mak b/cpp/demo/Ice/MFC/server/.depend.mak index 2bb694d7ffb..21bd808e814 100644 --- a/cpp/demo/Ice/MFC/server/.depend.mak +++ b/cpp/demo/Ice/MFC/server/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/Ice/async/.depend.mak b/cpp/demo/Ice/async/.depend.mak index 50425ba1b26..c89f2c8d502 100644 --- a/cpp/demo/Ice/async/.depend.mak +++ b/cpp/demo/Ice/async/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/Ice/bidir/.depend.mak b/cpp/demo/Ice/bidir/.depend.mak index 1dfd93c1a14..691c6fa5a52 100644 --- a/cpp/demo/Ice/bidir/.depend.mak +++ b/cpp/demo/Ice/bidir/.depend.mak @@ -1,7 +1,7 @@ -Callback.cpp: \ +Callback.h: \ Callback.ice \ - $(slicedir)/Ice/Identity.ice + "$(slicedir)/Ice/Identity.ice" Callback.obj: \ Callback.cpp \ diff --git a/cpp/demo/Ice/callback/.depend.mak b/cpp/demo/Ice/callback/.depend.mak index be00016c64f..8cda85a2a1c 100644 --- a/cpp/demo/Ice/callback/.depend.mak +++ b/cpp/demo/Ice/callback/.depend.mak @@ -1,5 +1,5 @@ -Callback.cpp: \ +Callback.h: \ Callback.ice Callback.obj: \ diff --git a/cpp/demo/Ice/context/.depend.mak b/cpp/demo/Ice/context/.depend.mak index 72abf09e007..02a7152b809 100644 --- a/cpp/demo/Ice/context/.depend.mak +++ b/cpp/demo/Ice/context/.depend.mak @@ -1,5 +1,5 @@ -Context.cpp: \ +Context.h: \ Context.ice Context.obj: \ diff --git a/cpp/demo/Ice/converter/.depend.mak b/cpp/demo/Ice/converter/.depend.mak index 8ec3f3e5d38..561edec0b09 100644 --- a/cpp/demo/Ice/converter/.depend.mak +++ b/cpp/demo/Ice/converter/.depend.mak @@ -1,5 +1,5 @@ -Greet.cpp: \ +Greet.h: \ Greet.ice Greet.obj: \ diff --git a/cpp/demo/Ice/hello/.depend.mak b/cpp/demo/Ice/hello/.depend.mak index 0046ab7dba2..b1250b8ce8e 100644 --- a/cpp/demo/Ice/hello/.depend.mak +++ b/cpp/demo/Ice/hello/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/Ice/interleaved/.depend.mak b/cpp/demo/Ice/interleaved/.depend.mak index f41caba83c6..87010470d7b 100644 --- a/cpp/demo/Ice/interleaved/.depend.mak +++ b/cpp/demo/Ice/interleaved/.depend.mak @@ -1,5 +1,5 @@ -Throughput.cpp: \ +Throughput.h: \ Throughput.ice Throughput.obj: \ diff --git a/cpp/demo/Ice/invoke/.depend.mak b/cpp/demo/Ice/invoke/.depend.mak index 91eaa2a5e41..46005f325d9 100644 --- a/cpp/demo/Ice/invoke/.depend.mak +++ b/cpp/demo/Ice/invoke/.depend.mak @@ -1,5 +1,5 @@ -Printer.cpp: \ +Printer.h: \ Printer.ice Printer.obj: \ diff --git a/cpp/demo/Ice/latency/.depend.mak b/cpp/demo/Ice/latency/.depend.mak index 8686f689f7d..437f0218613 100644 --- a/cpp/demo/Ice/latency/.depend.mak +++ b/cpp/demo/Ice/latency/.depend.mak @@ -1,5 +1,5 @@ -Latency.cpp: \ +Latency.h: \ Latency.ice Latency.obj: \ diff --git a/cpp/demo/Ice/minimal/.depend.mak b/cpp/demo/Ice/minimal/.depend.mak index 7dadc7836d7..4beccd5d1dc 100644 --- a/cpp/demo/Ice/minimal/.depend.mak +++ b/cpp/demo/Ice/minimal/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/Ice/multicast/.depend.mak b/cpp/demo/Ice/multicast/.depend.mak index ccfafaa4ed7..0e5c3941838 100644 --- a/cpp/demo/Ice/multicast/.depend.mak +++ b/cpp/demo/Ice/multicast/.depend.mak @@ -1,8 +1,8 @@ -Discovery.cpp: \ +Discovery.h: \ Discovery.ice -Hello.cpp: \ +Hello.h: \ Hello.ice Discovery.obj: \ diff --git a/cpp/demo/Ice/nested/.depend.mak b/cpp/demo/Ice/nested/.depend.mak index e34e9983942..9446c9bd69b 100644 --- a/cpp/demo/Ice/nested/.depend.mak +++ b/cpp/demo/Ice/nested/.depend.mak @@ -1,5 +1,5 @@ -Nested.cpp: \ +Nested.h: \ Nested.ice Nested.obj: \ diff --git a/cpp/demo/Ice/nrvo/.depend.mak b/cpp/demo/Ice/nrvo/.depend.mak index d45423b6633..f0ba502ce1b 100644 --- a/cpp/demo/Ice/nrvo/.depend.mak +++ b/cpp/demo/Ice/nrvo/.depend.mak @@ -1,5 +1,5 @@ -Nrvo.cpp: \ +Nrvo.h: \ Nrvo.ice Nrvo.obj: \ diff --git a/cpp/demo/Ice/optional/.depend.mak b/cpp/demo/Ice/optional/.depend.mak index 723398d88e3..e3e07e0bc66 100644 --- a/cpp/demo/Ice/optional/.depend.mak +++ b/cpp/demo/Ice/optional/.depend.mak @@ -1,5 +1,5 @@ -Contact.cpp: \ +Contact.h: \ Contact.ice Contact.obj: \ diff --git a/cpp/demo/Ice/plugin/.depend.mak b/cpp/demo/Ice/plugin/.depend.mak index 7be87568bd2..52f3643b3bc 100644 --- a/cpp/demo/Ice/plugin/.depend.mak +++ b/cpp/demo/Ice/plugin/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/Ice/properties/.depend.mak b/cpp/demo/Ice/properties/.depend.mak index e89f8b53209..f5f9dfeb2bb 100644 --- a/cpp/demo/Ice/properties/.depend.mak +++ b/cpp/demo/Ice/properties/.depend.mak @@ -1,9 +1,9 @@ -Props.cpp: \ +Props.h: \ Props.ice \ - $(slicedir)/Ice/Properties.ice \ - $(slicedir)/Ice/PropertiesAdmin.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" Props.obj: \ Props.cpp \ diff --git a/cpp/demo/Ice/session/.depend.mak b/cpp/demo/Ice/session/.depend.mak index 54f4696da2b..6086819741f 100644 --- a/cpp/demo/Ice/session/.depend.mak +++ b/cpp/demo/Ice/session/.depend.mak @@ -1,5 +1,5 @@ -Session.cpp: \ +Session.h: \ Session.ice Session.obj: \ diff --git a/cpp/demo/Ice/throughput/.depend.mak b/cpp/demo/Ice/throughput/.depend.mak index 1d9f643db14..687e618012e 100644 --- a/cpp/demo/Ice/throughput/.depend.mak +++ b/cpp/demo/Ice/throughput/.depend.mak @@ -1,5 +1,5 @@ -Throughput.cpp: \ +Throughput.h: \ Throughput.ice Throughput.obj: \ diff --git a/cpp/demo/Ice/value/.depend.mak b/cpp/demo/Ice/value/.depend.mak index b9bc094aaa5..7b014dcfe6f 100644 --- a/cpp/demo/Ice/value/.depend.mak +++ b/cpp/demo/Ice/value/.depend.mak @@ -1,5 +1,5 @@ -Value.cpp: \ +Value.h: \ Value.ice Value.obj: \ diff --git a/cpp/demo/IceBox/hello/.depend.mak b/cpp/demo/IceBox/hello/.depend.mak index 33e1b1729d0..106b1afb966 100644 --- a/cpp/demo/IceBox/hello/.depend.mak +++ b/cpp/demo/IceBox/hello/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/IceDiscovery/hello/.depend.mak b/cpp/demo/IceDiscovery/hello/.depend.mak index 0046ab7dba2..b1250b8ce8e 100644 --- a/cpp/demo/IceDiscovery/hello/.depend.mak +++ b/cpp/demo/IceDiscovery/hello/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/IceDiscovery/replication/.depend.mak b/cpp/demo/IceDiscovery/replication/.depend.mak index 19d8f53bdee..333b63efb53 100644 --- a/cpp/demo/IceDiscovery/replication/.depend.mak +++ b/cpp/demo/IceDiscovery/replication/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/IceGrid/allocate/.depend.mak b/cpp/demo/IceGrid/allocate/.depend.mak index 19d8f53bdee..333b63efb53 100644 --- a/cpp/demo/IceGrid/allocate/.depend.mak +++ b/cpp/demo/IceGrid/allocate/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/IceGrid/customLoadBalancing/.depend.mak b/cpp/demo/IceGrid/customLoadBalancing/.depend.mak index 8babb0db784..5357156f16a 100644 --- a/cpp/demo/IceGrid/customLoadBalancing/.depend.mak +++ b/cpp/demo/IceGrid/customLoadBalancing/.depend.mak @@ -1,7 +1,7 @@ -Pricing.cpp: \ +Pricing.h: \ Pricing.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/BuiltinSequences.ice" Pricing.obj: \ Pricing.cpp \ diff --git a/cpp/demo/IceGrid/icebox/.depend.mak b/cpp/demo/IceGrid/icebox/.depend.mak index 33e1b1729d0..106b1afb966 100644 --- a/cpp/demo/IceGrid/icebox/.depend.mak +++ b/cpp/demo/IceGrid/icebox/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/IceGrid/replication/.depend.mak b/cpp/demo/IceGrid/replication/.depend.mak index 19d8f53bdee..333b63efb53 100644 --- a/cpp/demo/IceGrid/replication/.depend.mak +++ b/cpp/demo/IceGrid/replication/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/IceGrid/secure/.depend.mak b/cpp/demo/IceGrid/secure/.depend.mak index fa4f8ce731e..753fa9a9667 100644 --- a/cpp/demo/IceGrid/secure/.depend.mak +++ b/cpp/demo/IceGrid/secure/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/IceGrid/sessionActivation/.depend.mak b/cpp/demo/IceGrid/sessionActivation/.depend.mak index 19d8f53bdee..333b63efb53 100644 --- a/cpp/demo/IceGrid/sessionActivation/.depend.mak +++ b/cpp/demo/IceGrid/sessionActivation/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/IceGrid/simple/.depend.mak b/cpp/demo/IceGrid/simple/.depend.mak index fa4f8ce731e..753fa9a9667 100644 --- a/cpp/demo/IceGrid/simple/.depend.mak +++ b/cpp/demo/IceGrid/simple/.depend.mak @@ -1,5 +1,5 @@ -Hello.cpp: \ +Hello.h: \ Hello.ice Hello.obj: \ diff --git a/cpp/demo/IceStorm/clock/.depend.mak b/cpp/demo/IceStorm/clock/.depend.mak index f5997aee7e5..29b748bfc96 100644 --- a/cpp/demo/IceStorm/clock/.depend.mak +++ b/cpp/demo/IceStorm/clock/.depend.mak @@ -1,5 +1,5 @@ -Clock.cpp: \ +Clock.h: \ Clock.ice Clock.obj: \ diff --git a/cpp/demo/IceStorm/counter/.depend.mak b/cpp/demo/IceStorm/counter/.depend.mak index f1374451609..214e56c8c6e 100644 --- a/cpp/demo/IceStorm/counter/.depend.mak +++ b/cpp/demo/IceStorm/counter/.depend.mak @@ -1,5 +1,5 @@ -Counter.cpp: \ +Counter.h: \ Counter.ice Counter.obj: \ diff --git a/cpp/demo/IceStorm/replicated/.depend.mak b/cpp/demo/IceStorm/replicated/.depend.mak index f5997aee7e5..29b748bfc96 100644 --- a/cpp/demo/IceStorm/replicated/.depend.mak +++ b/cpp/demo/IceStorm/replicated/.depend.mak @@ -1,5 +1,5 @@ -Clock.cpp: \ +Clock.h: \ Clock.ice Clock.obj: \ diff --git a/cpp/demo/IceStorm/replicated2/.depend.mak b/cpp/demo/IceStorm/replicated2/.depend.mak index f5997aee7e5..29b748bfc96 100644 --- a/cpp/demo/IceStorm/replicated2/.depend.mak +++ b/cpp/demo/IceStorm/replicated2/.depend.mak @@ -1,5 +1,5 @@ -Clock.cpp: \ +Clock.h: \ Clock.ice Clock.obj: \ diff --git a/cpp/demo/book/evictor_filesystem/.depend.mak b/cpp/demo/book/evictor_filesystem/.depend.mak index ec1f53d6e10..790b2197815 100644 --- a/cpp/demo/book/evictor_filesystem/.depend.mak +++ b/cpp/demo/book/evictor_filesystem/.depend.mak @@ -1,8 +1,8 @@ -Filesystem.cpp: \ +Filesystem.h: \ Filesystem.ice -PersistentFilesystem.cpp: \ +PersistentFilesystem.h: \ PersistentFilesystem.ice \ ./Filesystem.ice diff --git a/cpp/demo/book/lifecycle/.depend.mak b/cpp/demo/book/lifecycle/.depend.mak index 8da177bbafe..f660fa96166 100644 --- a/cpp/demo/book/lifecycle/.depend.mak +++ b/cpp/demo/book/lifecycle/.depend.mak @@ -1,5 +1,5 @@ -Filesystem.cpp: \ +Filesystem.h: \ Filesystem.ice Filesystem.obj: \ diff --git a/cpp/demo/book/map_filesystem/.depend.mak b/cpp/demo/book/map_filesystem/.depend.mak index 1fc04985064..796671319c8 100644 --- a/cpp/demo/book/map_filesystem/.depend.mak +++ b/cpp/demo/book/map_filesystem/.depend.mak @@ -1,11 +1,11 @@ -Filesystem.cpp: \ +Filesystem.h: \ Filesystem.ice -FilesystemDB.cpp: \ +FilesystemDB.h: \ FilesystemDB.ice \ ./Filesystem.ice \ - $(slicedir)/Ice/Identity.ice + "$(slicedir)/Ice/Identity.ice" Filesystem.obj: \ Filesystem.cpp \ diff --git a/cpp/demo/book/printer/.depend.mak b/cpp/demo/book/printer/.depend.mak index 369a8b52e4d..2ab64380d6c 100644 --- a/cpp/demo/book/printer/.depend.mak +++ b/cpp/demo/book/printer/.depend.mak @@ -1,5 +1,5 @@ -Printer.cpp: \ +Printer.h: \ Printer.ice Printer.obj: \ diff --git a/cpp/demo/book/simple_filesystem/.depend.mak b/cpp/demo/book/simple_filesystem/.depend.mak index 73aff0c5343..94dcb7876b9 100644 --- a/cpp/demo/book/simple_filesystem/.depend.mak +++ b/cpp/demo/book/simple_filesystem/.depend.mak @@ -1,5 +1,5 @@ -Filesystem.cpp: \ +Filesystem.h: \ Filesystem.ice Filesystem.obj: \ diff --git a/cpp/src/Freeze/.depend.mak b/cpp/src/Freeze/.depend.mak index a9907233b9e..dec23d3d38a 100644 --- a/cpp/src/Freeze/.depend.mak +++ b/cpp/src/Freeze/.depend.mak @@ -1,65 +1,65 @@ -BackgroundSaveEvictor.cpp: \ - $(slicedir)\Freeze\BackgroundSaveEvictor.ice \ - $(slicedir)/Freeze/Evictor.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ServantLocator.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Freeze/Exception.ice +BackgroundSaveEvictor.h: \ + "$(slicedir)\Freeze\BackgroundSaveEvictor.ice" \ + "$(slicedir)/Freeze/Evictor.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ServantLocator.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Freeze/Exception.ice" -CatalogData.cpp: \ - $(slicedir)\Freeze\CatalogData.ice +CatalogData.h: \ + "$(slicedir)\Freeze\CatalogData.ice" -Connection.cpp: \ - $(slicedir)\Freeze\Connection.ice \ - $(slicedir)/Freeze/Transaction.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/CommunicatorF.ice +Connection.h: \ + "$(slicedir)\Freeze\Connection.ice" \ + "$(slicedir)/Freeze/Transaction.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/CommunicatorF.ice" -ConnectionF.cpp: \ - $(slicedir)\Freeze\ConnectionF.ice +ConnectionF.h: \ + "$(slicedir)\Freeze\ConnectionF.ice" -DB.cpp: \ - $(slicedir)\Freeze\DB.ice +DB.h: \ + "$(slicedir)\Freeze\DB.ice" -Evictor.cpp: \ - $(slicedir)\Freeze\Evictor.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ServantLocator.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Freeze/Exception.ice +Evictor.h: \ + "$(slicedir)\Freeze\Evictor.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ServantLocator.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Freeze/Exception.ice" -EvictorF.cpp: \ - $(slicedir)\Freeze\EvictorF.ice +EvictorF.h: \ + "$(slicedir)\Freeze\EvictorF.ice" -EvictorStorage.cpp: \ - $(slicedir)\Freeze\EvictorStorage.ice \ - $(slicedir)/Ice/Identity.ice +EvictorStorage.h: \ + "$(slicedir)\Freeze\EvictorStorage.ice" \ + "$(slicedir)/Ice/Identity.ice" -Exception.cpp: \ - $(slicedir)\Freeze\Exception.ice +Exception.h: \ + "$(slicedir)\Freeze\Exception.ice" -Transaction.cpp: \ - $(slicedir)\Freeze\Transaction.ice +Transaction.h: \ + "$(slicedir)\Freeze\Transaction.ice" -TransactionalEvictor.cpp: \ - $(slicedir)\Freeze\TransactionalEvictor.ice \ - $(slicedir)/Freeze/Evictor.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ServantLocator.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Freeze/Exception.ice +TransactionalEvictor.h: \ + "$(slicedir)\Freeze\TransactionalEvictor.ice" \ + "$(slicedir)/Freeze/Evictor.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ServantLocator.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Freeze/Exception.ice" -PingObject.cpp: \ +PingObject.h: \ PingObject.ice BackgroundSaveEvictorI.obj: \ diff --git a/cpp/src/Glacier2/.depend.mak b/cpp/src/Glacier2/.depend.mak index f8826f3429e..6646f6442a0 100644 --- a/cpp/src/Glacier2/.depend.mak +++ b/cpp/src/Glacier2/.depend.mak @@ -1,13 +1,13 @@ -Instrumentation.cpp: \ +Instrumentation.h: \ Instrumentation.ice \ - $(slicedir)/Ice/Instrumentation.ice \ - $(slicedir)/Ice/EndpointF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice + "$(slicedir)/Ice/Instrumentation.ice" \ + "$(slicedir)/Ice/EndpointF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" Blobject.obj: \ Blobject.cpp \ diff --git a/cpp/src/Glacier2Lib/.depend.mak b/cpp/src/Glacier2Lib/.depend.mak index 29a0081b64e..01270f7560b 100644 --- a/cpp/src/Glacier2Lib/.depend.mak +++ b/cpp/src/Glacier2Lib/.depend.mak @@ -1,38 +1,38 @@ -Metrics.cpp: \ - $(slicedir)\Glacier2\Metrics.ice \ - $(slicedir)/Ice/Metrics.ice \ - $(slicedir)/Ice/BuiltinSequences.ice +Metrics.h: \ + "$(slicedir)\Glacier2\Metrics.ice" \ + "$(slicedir)/Ice/Metrics.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" -PermissionsVerifierF.cpp: \ - $(slicedir)\Glacier2\PermissionsVerifierF.ice +PermissionsVerifierF.h: \ + "$(slicedir)\Glacier2\PermissionsVerifierF.ice" -PermissionsVerifier.cpp: \ - $(slicedir)\Glacier2\PermissionsVerifier.ice \ - $(slicedir)/Glacier2/SSLInfo.ice \ - $(slicedir)/Ice/BuiltinSequences.ice +PermissionsVerifier.h: \ + "$(slicedir)\Glacier2\PermissionsVerifier.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" -Router.cpp: \ - $(slicedir)\Glacier2\Router.ice \ - $(slicedir)/Ice/Router.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Glacier2/Session.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Glacier2/SSLInfo.ice \ - $(slicedir)/Glacier2/PermissionsVerifier.ice +Router.h: \ + "$(slicedir)\Glacier2\Router.ice" \ + "$(slicedir)/Ice/Router.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Glacier2/Session.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" \ + "$(slicedir)/Glacier2/PermissionsVerifier.ice" -RouterF.cpp: \ - $(slicedir)\Glacier2\RouterF.ice +RouterF.h: \ + "$(slicedir)\Glacier2\RouterF.ice" -Session.cpp: \ - $(slicedir)\Glacier2\Session.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Glacier2/SSLInfo.ice +Session.h: \ + "$(slicedir)\Glacier2\Session.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" -SSLInfo.cpp: \ - $(slicedir)\Glacier2\SSLInfo.ice \ - $(slicedir)/Ice/BuiltinSequences.ice +SSLInfo.h: \ + "$(slicedir)\Glacier2\SSLInfo.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" Application.obj: \ Application.cpp \ diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak index 8f98caafbf2..4d39100a7a7 100644 --- a/cpp/src/Ice/.depend.mak +++ b/cpp/src/Ice/.depend.mak @@ -1,189 +1,189 @@ -BuiltinSequences.cpp: \ - $(slicedir)\Ice\BuiltinSequences.ice - -Communicator.cpp: \ - $(slicedir)\Ice\Communicator.ice \ - $(slicedir)/Ice/LoggerF.ice \ - $(slicedir)/Ice/InstrumentationF.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ObjectFactoryF.ice \ - $(slicedir)/Ice/RouterF.ice \ - $(slicedir)/Ice/LocatorF.ice \ - $(slicedir)/Ice/PluginF.ice \ - $(slicedir)/Ice/ImplicitContextF.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/Properties.ice \ - $(slicedir)/Ice/PropertiesAdmin.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/FacetMap.ice - -CommunicatorF.cpp: \ - $(slicedir)\Ice\CommunicatorF.ice - -Connection.cpp: \ - $(slicedir)\Ice\Connection.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Endpoint.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/EndpointF.ice - -ConnectionF.cpp: \ - $(slicedir)\Ice\ConnectionF.ice - -Current.cpp: \ - $(slicedir)\Ice\Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice - -Endpoint.cpp: \ - $(slicedir)\Ice\Endpoint.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/EndpointF.ice - -EndpointF.cpp: \ - $(slicedir)\Ice\EndpointF.ice - -EndpointTypes.cpp: \ - $(slicedir)\Ice\EndpointTypes.ice - -FacetMap.cpp: \ - $(slicedir)\Ice\FacetMap.ice - -Identity.cpp: \ - $(slicedir)\Ice\Identity.ice - -ImplicitContext.cpp: \ - $(slicedir)\Ice\ImplicitContext.ice \ - $(slicedir)/Ice/LocalException.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice - -ImplicitContextF.cpp: \ - $(slicedir)\Ice\ImplicitContextF.ice - -Instrumentation.cpp: \ - $(slicedir)\Ice\Instrumentation.ice \ - $(slicedir)/Ice/EndpointF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice - -InstrumentationF.cpp: \ - $(slicedir)\Ice\InstrumentationF.ice - -LocalException.cpp: \ - $(slicedir)\Ice\LocalException.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/BuiltinSequences.ice - -Locator.cpp: \ - $(slicedir)\Ice\Locator.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/ProcessF.ice - -LocatorF.cpp: \ - $(slicedir)\Ice\LocatorF.ice - -Logger.cpp: \ - $(slicedir)\Ice\Logger.ice - -LoggerF.cpp: \ - $(slicedir)\Ice\LoggerF.ice - -Metrics.cpp: \ - $(slicedir)\Ice\Metrics.ice \ - $(slicedir)/Ice/BuiltinSequences.ice - -ObjectAdapter.cpp: \ - $(slicedir)\Ice\ObjectAdapter.ice \ - $(slicedir)/Ice/CommunicatorF.ice \ - $(slicedir)/Ice/ServantLocatorF.ice \ - $(slicedir)/Ice/LocatorF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/FacetMap.ice \ - $(slicedir)/Ice/Endpoint.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/EndpointF.ice - -ObjectAdapterF.cpp: \ - $(slicedir)\Ice\ObjectAdapterF.ice - -ObjectFactory.cpp: \ - $(slicedir)\Ice\ObjectFactory.ice - -ObjectFactoryF.cpp: \ - $(slicedir)\Ice\ObjectFactoryF.ice - -Plugin.cpp: \ - $(slicedir)\Ice\Plugin.ice \ - $(slicedir)/Ice/LoggerF.ice \ - $(slicedir)/Ice/BuiltinSequences.ice - -PluginF.cpp: \ - $(slicedir)\Ice\PluginF.ice - -Process.cpp: \ - $(slicedir)\Ice\Process.ice - -ProcessF.cpp: \ - $(slicedir)\Ice\ProcessF.ice - -Properties.cpp: \ - $(slicedir)\Ice\Properties.ice \ - $(slicedir)/Ice/PropertiesAdmin.ice \ - $(slicedir)/Ice/BuiltinSequences.ice - -PropertiesAdmin.cpp: \ - $(slicedir)\Ice\PropertiesAdmin.ice \ - $(slicedir)/Ice/BuiltinSequences.ice - -PropertiesF.cpp: \ - $(slicedir)\Ice\PropertiesF.ice - -RemoteLogger.cpp: \ - $(slicedir)\Ice\RemoteLogger.ice \ - $(slicedir)/Ice/BuiltinSequences.ice - -Router.cpp: \ - $(slicedir)\Ice\Router.ice \ - $(slicedir)/Ice/BuiltinSequences.ice - -RouterF.cpp: \ - $(slicedir)\Ice\RouterF.ice - -ServantLocator.cpp: \ - $(slicedir)\Ice\ServantLocator.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice - -ServantLocatorF.cpp: \ - $(slicedir)\Ice\ServantLocatorF.ice - -SliceChecksumDict.cpp: \ - $(slicedir)\Ice\SliceChecksumDict.ice +BuiltinSequences.h: \ + "$(slicedir)\Ice\BuiltinSequences.ice" + +Communicator.h: \ + "$(slicedir)\Ice\Communicator.ice" \ + "$(slicedir)/Ice/LoggerF.ice" \ + "$(slicedir)/Ice/InstrumentationF.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ObjectFactoryF.ice" \ + "$(slicedir)/Ice/RouterF.ice" \ + "$(slicedir)/Ice/LocatorF.ice" \ + "$(slicedir)/Ice/PluginF.ice" \ + "$(slicedir)/Ice/ImplicitContextF.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/FacetMap.ice" + +CommunicatorF.h: \ + "$(slicedir)\Ice\CommunicatorF.ice" + +Connection.h: \ + "$(slicedir)\Ice\Connection.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/EndpointF.ice" + +ConnectionF.h: \ + "$(slicedir)\Ice\ConnectionF.ice" + +Current.h: \ + "$(slicedir)\Ice\Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" + +Endpoint.h: \ + "$(slicedir)\Ice\Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/EndpointF.ice" + +EndpointF.h: \ + "$(slicedir)\Ice\EndpointF.ice" + +EndpointTypes.h: \ + "$(slicedir)\Ice\EndpointTypes.ice" + +FacetMap.h: \ + "$(slicedir)\Ice\FacetMap.ice" + +Identity.h: \ + "$(slicedir)\Ice\Identity.ice" + +ImplicitContext.h: \ + "$(slicedir)\Ice\ImplicitContext.ice" \ + "$(slicedir)/Ice/LocalException.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" + +ImplicitContextF.h: \ + "$(slicedir)\Ice\ImplicitContextF.ice" + +Instrumentation.h: \ + "$(slicedir)\Ice\Instrumentation.ice" \ + "$(slicedir)/Ice/EndpointF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" + +InstrumentationF.h: \ + "$(slicedir)\Ice\InstrumentationF.ice" + +LocalException.h: \ + "$(slicedir)\Ice\LocalException.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +Locator.h: \ + "$(slicedir)\Ice\Locator.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/ProcessF.ice" + +LocatorF.h: \ + "$(slicedir)\Ice\LocatorF.ice" + +Logger.h: \ + "$(slicedir)\Ice\Logger.ice" + +LoggerF.h: \ + "$(slicedir)\Ice\LoggerF.ice" + +Metrics.h: \ + "$(slicedir)\Ice\Metrics.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +ObjectAdapter.h: \ + "$(slicedir)\Ice\ObjectAdapter.ice" \ + "$(slicedir)/Ice/CommunicatorF.ice" \ + "$(slicedir)/Ice/ServantLocatorF.ice" \ + "$(slicedir)/Ice/LocatorF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/FacetMap.ice" \ + "$(slicedir)/Ice/Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/EndpointF.ice" + +ObjectAdapterF.h: \ + "$(slicedir)\Ice\ObjectAdapterF.ice" + +ObjectFactory.h: \ + "$(slicedir)\Ice\ObjectFactory.ice" + +ObjectFactoryF.h: \ + "$(slicedir)\Ice\ObjectFactoryF.ice" + +Plugin.h: \ + "$(slicedir)\Ice\Plugin.ice" \ + "$(slicedir)/Ice/LoggerF.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +PluginF.h: \ + "$(slicedir)\Ice\PluginF.ice" + +Process.h: \ + "$(slicedir)\Ice\Process.ice" + +ProcessF.h: \ + "$(slicedir)\Ice\ProcessF.ice" + +Properties.h: \ + "$(slicedir)\Ice\Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +PropertiesAdmin.h: \ + "$(slicedir)\Ice\PropertiesAdmin.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +PropertiesF.h: \ + "$(slicedir)\Ice\PropertiesF.ice" + +RemoteLogger.h: \ + "$(slicedir)\Ice\RemoteLogger.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +Router.h: \ + "$(slicedir)\Ice\Router.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" + +RouterF.h: \ + "$(slicedir)\Ice\RouterF.ice" + +ServantLocator.h: \ + "$(slicedir)\Ice\ServantLocator.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" + +ServantLocatorF.h: \ + "$(slicedir)\Ice\ServantLocatorF.ice" + +SliceChecksumDict.h: \ + "$(slicedir)\Ice\SliceChecksumDict.ice" -Version.cpp: \ - $(slicedir)\Ice\Version.ice +Version.h: \ + "$(slicedir)\Ice\Version.ice" Acceptor.obj: \ Acceptor.cpp \ diff --git a/cpp/src/IceBox/.depend.mak b/cpp/src/IceBox/.depend.mak index c8cb224d4a8..21961a7b9b7 100644 --- a/cpp/src/IceBox/.depend.mak +++ b/cpp/src/IceBox/.depend.mak @@ -1,10 +1,10 @@ -IceBox.cpp: \ - $(slicedir)\IceBox\IceBox.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/CommunicatorF.ice \ - $(slicedir)/Ice/PropertiesF.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice +IceBox.h: \ + "$(slicedir)\IceBox\IceBox.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/CommunicatorF.ice" \ + "$(slicedir)/Ice/PropertiesF.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" Service.obj: \ Service.cpp \ diff --git a/cpp/src/IceDiscovery/.depend.mak b/cpp/src/IceDiscovery/.depend.mak index 298455c018a..ea69682d1fa 100644 --- a/cpp/src/IceDiscovery/.depend.mak +++ b/cpp/src/IceDiscovery/.depend.mak @@ -1,7 +1,7 @@ -IceDiscovery.cpp: \ - $(slicedir)\IceDiscovery\IceDiscovery.ice \ - $(slicedir)/Ice/Identity.ice +IceDiscovery.h: \ + "$(slicedir)\IceDiscovery\IceDiscovery.ice" \ + "$(slicedir)/Ice/Identity.ice" LocatorI.obj: \ LocatorI.cpp \ diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak index 25e7bf11173..b35d9e7ef9c 100644 --- a/cpp/src/IceGrid/.depend.mak +++ b/cpp/src/IceGrid/.depend.mak @@ -1,21 +1,21 @@ -Internal.cpp: \ +Internal.h: \ Internal.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/ProcessF.ice \ - $(slicedir)/Ice/Locator.ice \ - $(slicedir)/Ice/Properties.ice \ - $(slicedir)/Ice/PropertiesAdmin.ice \ - $(slicedir)/Glacier2/Session.ice \ - $(slicedir)/Glacier2/SSLInfo.ice \ - $(slicedir)/IceGrid/Admin.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/IceGrid/Exception.ice \ - $(slicedir)/IceGrid/Descriptor.ice \ - $(slicedir)/IceGrid/Observer.ice \ - $(slicedir)/IceGrid/Registry.ice \ - $(slicedir)/IceGrid/Session.ice + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/ProcessF.ice" \ + "$(slicedir)/Ice/Locator.ice" \ + "$(slicedir)/Ice/Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Glacier2/Session.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" \ + "$(slicedir)/IceGrid/Admin.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/IceGrid/Exception.ice" \ + "$(slicedir)/IceGrid/Descriptor.ice" \ + "$(slicedir)/IceGrid/Observer.ice" \ + "$(slicedir)/IceGrid/Registry.ice" \ + "$(slicedir)/IceGrid/Session.ice" Client.obj: \ Client.cpp \ @@ -4276,6 +4276,7 @@ LocatorI.obj: \ "StringApplicationInfoDict.h" \ "StringAdapterInfoDict.h" \ "IdentityObjectInfoDict.h" \ + "WellKnownObjectsManager.h" \ "SessionI.h" \ "ReapThread.h" \ "SessionServantManager.h" \ diff --git a/cpp/src/IceGridLib/.depend.mak b/cpp/src/IceGridLib/.depend.mak index 210b440735e..c3793d6f8eb 100644 --- a/cpp/src/IceGridLib/.depend.mak +++ b/cpp/src/IceGridLib/.depend.mak @@ -1,112 +1,112 @@ -Admin.cpp: \ - $(slicedir)\IceGrid\Admin.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Properties.ice \ - $(slicedir)/Ice/PropertiesAdmin.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/Glacier2/Session.ice \ - $(slicedir)/Glacier2/SSLInfo.ice \ - $(slicedir)/IceGrid/Exception.ice \ - $(slicedir)/IceGrid/Descriptor.ice +Admin.h: \ + "$(slicedir)\IceGrid\Admin.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/Glacier2/Session.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" \ + "$(slicedir)/IceGrid/Exception.ice" \ + "$(slicedir)/IceGrid/Descriptor.ice" -Descriptor.cpp: \ - $(slicedir)\IceGrid\Descriptor.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/BuiltinSequences.ice +Descriptor.h: \ + "$(slicedir)\IceGrid\Descriptor.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" -Discovery.cpp: \ - $(slicedir)\IceGrid\Discovery.ice \ - $(slicedir)/IceGrid/Locator.ice \ - $(slicedir)/Ice/Locator.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/ProcessF.ice +Discovery.h: \ + "$(slicedir)\IceGrid\Discovery.ice" \ + "$(slicedir)/IceGrid/Locator.ice" \ + "$(slicedir)/Ice/Locator.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/ProcessF.ice" -Exception.cpp: \ - $(slicedir)\IceGrid\Exception.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/BuiltinSequences.ice +Exception.h: \ + "$(slicedir)\IceGrid\Exception.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" -FileParser.cpp: \ - $(slicedir)\IceGrid\FileParser.ice \ - $(slicedir)/IceGrid/Admin.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Properties.ice \ - $(slicedir)/Ice/PropertiesAdmin.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/Glacier2/Session.ice \ - $(slicedir)/Glacier2/SSLInfo.ice \ - $(slicedir)/IceGrid/Exception.ice \ - $(slicedir)/IceGrid/Descriptor.ice +FileParser.h: \ + "$(slicedir)\IceGrid\FileParser.ice" \ + "$(slicedir)/IceGrid/Admin.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/Glacier2/Session.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" \ + "$(slicedir)/IceGrid/Exception.ice" \ + "$(slicedir)/IceGrid/Descriptor.ice" -Locator.cpp: \ - $(slicedir)\IceGrid\Locator.ice \ - $(slicedir)/Ice/Locator.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/ProcessF.ice +Locator.h: \ + "$(slicedir)\IceGrid\Locator.ice" \ + "$(slicedir)/Ice/Locator.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/ProcessF.ice" -Observer.cpp: \ - $(slicedir)\IceGrid\Observer.ice \ - $(slicedir)/Glacier2/Session.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Glacier2/SSLInfo.ice \ - $(slicedir)/IceGrid/Exception.ice \ - $(slicedir)/IceGrid/Descriptor.ice \ - $(slicedir)/IceGrid/Admin.ice \ - $(slicedir)/Ice/Properties.ice \ - $(slicedir)/Ice/PropertiesAdmin.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice +Observer.h: \ + "$(slicedir)\IceGrid\Observer.ice" \ + "$(slicedir)/Glacier2/Session.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" \ + "$(slicedir)/IceGrid/Exception.ice" \ + "$(slicedir)/IceGrid/Descriptor.ice" \ + "$(slicedir)/IceGrid/Admin.ice" \ + "$(slicedir)/Ice/Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" -PluginFacade.cpp: \ - $(slicedir)\IceGrid\PluginFacade.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/IceGrid/Admin.ice \ - $(slicedir)/Ice/Properties.ice \ - $(slicedir)/Ice/PropertiesAdmin.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/Glacier2/Session.ice \ - $(slicedir)/Glacier2/SSLInfo.ice \ - $(slicedir)/IceGrid/Exception.ice \ - $(slicedir)/IceGrid/Descriptor.ice +PluginFacade.h: \ + "$(slicedir)\IceGrid\PluginFacade.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/IceGrid/Admin.ice" \ + "$(slicedir)/Ice/Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/Glacier2/Session.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" \ + "$(slicedir)/IceGrid/Exception.ice" \ + "$(slicedir)/IceGrid/Descriptor.ice" -Query.cpp: \ - $(slicedir)\IceGrid\Query.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/IceGrid/Exception.ice +Query.h: \ + "$(slicedir)\IceGrid\Query.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/IceGrid/Exception.ice" -Registry.cpp: \ - $(slicedir)\IceGrid\Registry.ice \ - $(slicedir)/IceGrid/Exception.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/IceGrid/Session.ice \ - $(slicedir)/Glacier2/Session.ice \ - $(slicedir)/Glacier2/SSLInfo.ice \ - $(slicedir)/IceGrid/Admin.ice \ - $(slicedir)/Ice/Properties.ice \ - $(slicedir)/Ice/PropertiesAdmin.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/IceGrid/Descriptor.ice +Registry.h: \ + "$(slicedir)\IceGrid\Registry.ice" \ + "$(slicedir)/IceGrid/Exception.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/IceGrid/Session.ice" \ + "$(slicedir)/Glacier2/Session.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" \ + "$(slicedir)/IceGrid/Admin.ice" \ + "$(slicedir)/Ice/Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/IceGrid/Descriptor.ice" -Session.cpp: \ - $(slicedir)\IceGrid\Session.ice \ - $(slicedir)/Glacier2/Session.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Glacier2/SSLInfo.ice \ - $(slicedir)/IceGrid/Exception.ice +Session.h: \ + "$(slicedir)\IceGrid\Session.ice" \ + "$(slicedir)/Glacier2/Session.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" \ + "$(slicedir)/IceGrid/Exception.ice" -UserAccountMapper.cpp: \ - $(slicedir)\IceGrid\UserAccountMapper.ice +UserAccountMapper.h: \ + "$(slicedir)\IceGrid\UserAccountMapper.ice" DiscoveryPluginI.obj: \ DiscoveryPluginI.cpp \ diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak index 5c367d4002a..3db997c71f6 100644 --- a/cpp/src/IcePatch2Lib/.depend.mak +++ b/cpp/src/IcePatch2Lib/.depend.mak @@ -1,12 +1,12 @@ -FileInfo.cpp: \ - $(slicedir)\IcePatch2\FileInfo.ice \ - $(slicedir)/Ice/BuiltinSequences.ice +FileInfo.h: \ + "$(slicedir)\IcePatch2\FileInfo.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" -FileServer.cpp: \ - $(slicedir)\IcePatch2\FileServer.ice \ - $(slicedir)/IcePatch2/FileInfo.ice \ - $(slicedir)/Ice/BuiltinSequences.ice +FileServer.h: \ + "$(slicedir)\IcePatch2\FileServer.ice" \ + "$(slicedir)/IcePatch2/FileInfo.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" ClientUtil.obj: \ ClientUtil.cpp \ diff --git a/cpp/src/IceSSL/.depend.mak b/cpp/src/IceSSL/.depend.mak index 95b11b4a24e..8ee69282e04 100644 --- a/cpp/src/IceSSL/.depend.mak +++ b/cpp/src/IceSSL/.depend.mak @@ -1,20 +1,20 @@ -ConnectionInfo.cpp: \ - $(slicedir)\IceSSL\ConnectionInfo.ice \ - $(slicedir)/Ice/Connection.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Endpoint.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/EndpointF.ice +ConnectionInfo.h: \ + "$(slicedir)\IceSSL\ConnectionInfo.ice" \ + "$(slicedir)/Ice/Connection.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/EndpointF.ice" -EndpointInfo.cpp: \ - $(slicedir)\IceSSL\EndpointInfo.ice \ - $(slicedir)/Ice/Endpoint.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/EndpointF.ice +EndpointInfo.h: \ + "$(slicedir)\IceSSL\EndpointInfo.ice" \ + "$(slicedir)/Ice/Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/EndpointF.ice" ConnectionInfo.obj: \ ConnectionInfo.cpp \ diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak index 64ba087ee50..1989b110ef1 100644 --- a/cpp/src/IceStorm/.depend.mak +++ b/cpp/src/IceStorm/.depend.mak @@ -1,110 +1,110 @@ -Election.cpp: \ +Election.h: \ Election.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ ../IceStorm/SubscriberRecord.ice \ - $(slicedir)/IceStorm/IceStorm.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/IceStorm/Metrics.ice \ - $(slicedir)/Ice/Metrics.ice \ + "$(slicedir)/IceStorm/IceStorm.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/IceStorm/Metrics.ice" \ + "$(slicedir)/Ice/Metrics.ice" \ ../IceStorm/LLURecord.ice -IceStormInternal.cpp: \ +IceStormInternal.h: \ IceStormInternal.ice \ - $(slicedir)/IceStorm/IceStorm.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/IceStorm/Metrics.ice \ - $(slicedir)/Ice/Metrics.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ + "$(slicedir)/IceStorm/IceStorm.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/IceStorm/Metrics.ice" \ + "$(slicedir)/Ice/Metrics.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ ../IceStorm/Election.ice \ ../IceStorm/SubscriberRecord.ice \ ../IceStorm/LLURecord.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Version.ice + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Version.ice" -Instrumentation.cpp: \ +Instrumentation.h: \ Instrumentation.ice \ - $(slicedir)/Ice/Instrumentation.ice \ - $(slicedir)/Ice/EndpointF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/IceStorm/IceStorm.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/IceStorm/Metrics.ice \ - $(slicedir)/Ice/Metrics.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/Instrumentation.ice" \ + "$(slicedir)/Ice/EndpointF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/IceStorm/IceStorm.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/IceStorm/Metrics.ice" \ + "$(slicedir)/Ice/Metrics.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" -LinkRecord.cpp: \ +LinkRecord.h: \ LinkRecord.ice \ - $(slicedir)/Ice/Identity.ice \ + "$(slicedir)/Ice/Identity.ice" \ ../IceStorm/IceStormInternal.ice \ - $(slicedir)/IceStorm/IceStorm.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/IceStorm/Metrics.ice \ - $(slicedir)/Ice/Metrics.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ + "$(slicedir)/IceStorm/IceStorm.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/IceStorm/Metrics.ice" \ + "$(slicedir)/Ice/Metrics.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ ../IceStorm/Election.ice \ ../IceStorm/SubscriberRecord.ice \ ../IceStorm/LLURecord.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Version.ice + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Version.ice" -LLURecord.cpp: \ +LLURecord.h: \ LLURecord.ice -SubscriberRecord.cpp: \ +SubscriberRecord.h: \ SubscriberRecord.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/IceStorm/IceStorm.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/IceStorm/Metrics.ice \ - $(slicedir)/Ice/Metrics.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/IceStorm/IceStorm.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/IceStorm/Metrics.ice" \ + "$(slicedir)/Ice/Metrics.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" -V31Format.cpp: \ +V31Format.h: \ V31Format.ice \ ../IceStorm/LinkRecord.ice \ - $(slicedir)/Ice/Identity.ice \ + "$(slicedir)/Ice/Identity.ice" \ ../IceStorm/IceStormInternal.ice \ - $(slicedir)/IceStorm/IceStorm.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/IceStorm/Metrics.ice \ - $(slicedir)/Ice/Metrics.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ + "$(slicedir)/IceStorm/IceStorm.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/IceStorm/Metrics.ice" \ + "$(slicedir)/Ice/Metrics.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ ../IceStorm/Election.ice \ ../IceStorm/SubscriberRecord.ice \ ../IceStorm/LLURecord.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Version.ice + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Version.ice" -V32Format.cpp: \ +V32Format.h: \ V32Format.ice \ ../IceStorm/LinkRecord.ice \ - $(slicedir)/Ice/Identity.ice \ + "$(slicedir)/Ice/Identity.ice" \ ../IceStorm/IceStormInternal.ice \ - $(slicedir)/IceStorm/IceStorm.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/IceStorm/Metrics.ice \ - $(slicedir)/Ice/Metrics.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ + "$(slicedir)/IceStorm/IceStorm.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/IceStorm/Metrics.ice" \ + "$(slicedir)/Ice/Metrics.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ ../IceStorm/Election.ice \ ../IceStorm/SubscriberRecord.ice \ ../IceStorm/LLURecord.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Version.ice + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Version.ice" Instance.obj: \ Instance.cpp \ diff --git a/cpp/src/IceStormLib/.depend.mak b/cpp/src/IceStormLib/.depend.mak index c4aa9c856e6..fcf2119c005 100644 --- a/cpp/src/IceStormLib/.depend.mak +++ b/cpp/src/IceStormLib/.depend.mak @@ -1,16 +1,16 @@ -IceStorm.cpp: \ - $(slicedir)\IceStorm\IceStorm.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice \ - $(slicedir)/IceStorm/Metrics.ice \ - $(slicedir)/Ice/Metrics.ice \ - $(slicedir)/Ice/BuiltinSequences.ice +IceStorm.h: \ + "$(slicedir)\IceStorm\IceStorm.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/SliceChecksumDict.ice" \ + "$(slicedir)/IceStorm/Metrics.ice" \ + "$(slicedir)/Ice/Metrics.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" -Metrics.cpp: \ - $(slicedir)\IceStorm\Metrics.ice \ - $(slicedir)/Ice/Metrics.ice \ - $(slicedir)/Ice/BuiltinSequences.ice +Metrics.h: \ + "$(slicedir)\IceStorm\Metrics.ice" \ + "$(slicedir)/Ice/Metrics.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" IceStorm.obj: \ IceStorm.cpp \ diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index a549d224a89..25eb99c26c7 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -491,16 +491,14 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin case CPlusPlus: { // - // Change .o[bj] suffix to the cpp source extension suffix. + // Change .o[bj] suffix to the h header extension suffix. // string::size_type pos = result.find(suffix); if(pos != string::npos) { string name = result.substr(0, pos); - result.replace(0, pos + suffix.size() - 1, name + "." + cppSourceExt); + result.replace(0, pos + suffix.size() - 1, name + "." + cppHeaderExt); - result += "\n"; - result += name + "." + cppHeaderExt + ": " + name + "." + cppSourceExt; } break; } @@ -510,7 +508,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin { // // We want to shift the files left one position, so that - // "x.cpp: x.ice y.ice" becomes "x.ice: y.ice". + // "x.h: x.ice y.ice" becomes "x.ice: y.ice". // // diff --git a/cpp/test/Freeze/complex/.depend.mak b/cpp/test/Freeze/complex/.depend.mak index 8aef2038657..596b40ad3e1 100644 --- a/cpp/test/Freeze/complex/.depend.mak +++ b/cpp/test/Freeze/complex/.depend.mak @@ -1,5 +1,5 @@ -Complex.cpp: \ +Complex.h: \ Complex.ice Complex.obj: \ diff --git a/cpp/test/Freeze/evictor/.depend.mak b/cpp/test/Freeze/evictor/.depend.mak index 3a1bff9ac31..4042656a4f1 100644 --- a/cpp/test/Freeze/evictor/.depend.mak +++ b/cpp/test/Freeze/evictor/.depend.mak @@ -1,7 +1,7 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/Identity.ice + "$(slicedir)/Ice/Identity.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/FreezeScript/dbmap/.depend.mak b/cpp/test/FreezeScript/dbmap/.depend.mak index f9b9e704223..d2aaa15c607 100644 --- a/cpp/test/FreezeScript/dbmap/.depend.mak +++ b/cpp/test/FreezeScript/dbmap/.depend.mak @@ -1,5 +1,5 @@ -TestOld.cpp: \ +TestOld.h: \ TestOld.ice TestOld.obj: \ diff --git a/cpp/test/FreezeScript/evictor/.depend.mak b/cpp/test/FreezeScript/evictor/.depend.mak index 44030917fc9..a088ca28d8b 100644 --- a/cpp/test/FreezeScript/evictor/.depend.mak +++ b/cpp/test/FreezeScript/evictor/.depend.mak @@ -1,5 +1,5 @@ -TestOld.cpp: \ +TestOld.h: \ TestOld.ice TestOld.obj: \ diff --git a/cpp/test/Glacier2/attack/.depend.mak b/cpp/test/Glacier2/attack/.depend.mak index 96a9cf1d6e0..30a57667593 100644 --- a/cpp/test/Glacier2/attack/.depend.mak +++ b/cpp/test/Glacier2/attack/.depend.mak @@ -1,5 +1,5 @@ -Backend.cpp: \ +Backend.h: \ Backend.ice Backend.obj: \ diff --git a/cpp/test/Glacier2/dynamicFiltering/.depend.mak b/cpp/test/Glacier2/dynamicFiltering/.depend.mak index fc1b0e92ccb..9399435465b 100644 --- a/cpp/test/Glacier2/dynamicFiltering/.depend.mak +++ b/cpp/test/Glacier2/dynamicFiltering/.depend.mak @@ -1,10 +1,10 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Glacier2/Session.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Glacier2/SSLInfo.ice + "$(slicedir)/Glacier2/Session.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/Glacier2/override/.depend.mak b/cpp/test/Glacier2/override/.depend.mak index 00c0e40550a..bc581bb0f0f 100644 --- a/cpp/test/Glacier2/override/.depend.mak +++ b/cpp/test/Glacier2/override/.depend.mak @@ -1,7 +1,7 @@ -Callback.cpp: \ +Callback.h: \ Callback.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/BuiltinSequences.ice" Callback.obj: \ Callback.cpp \ diff --git a/cpp/test/Glacier2/router/.depend.mak b/cpp/test/Glacier2/router/.depend.mak index 946ff6454ac..7364092f233 100644 --- a/cpp/test/Glacier2/router/.depend.mak +++ b/cpp/test/Glacier2/router/.depend.mak @@ -1,7 +1,7 @@ -Callback.cpp: \ +Callback.h: \ Callback.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/BuiltinSequences.ice" Callback.obj: \ Callback.cpp \ diff --git a/cpp/test/Glacier2/sessionControl/.depend.mak b/cpp/test/Glacier2/sessionControl/.depend.mak index b431647bda0..9fa355ddf0b 100644 --- a/cpp/test/Glacier2/sessionControl/.depend.mak +++ b/cpp/test/Glacier2/sessionControl/.depend.mak @@ -1,10 +1,10 @@ -Session.cpp: \ +Session.h: \ Session.ice \ - $(slicedir)/Glacier2/Session.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Glacier2/SSLInfo.ice + "$(slicedir)/Glacier2/Session.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" Session.obj: \ Session.cpp \ diff --git a/cpp/test/Glacier2/sessionHelper/.depend.mak b/cpp/test/Glacier2/sessionHelper/.depend.mak index 6a4d8fa76bd..b5172ef0f65 100644 --- a/cpp/test/Glacier2/sessionHelper/.depend.mak +++ b/cpp/test/Glacier2/sessionHelper/.depend.mak @@ -1,5 +1,5 @@ -Callback.cpp: \ +Callback.h: \ Callback.ice Callback.obj: \ diff --git a/cpp/test/Glacier2/staticFiltering/.depend.mak b/cpp/test/Glacier2/staticFiltering/.depend.mak index 4c0bc83a91e..8064f178307 100644 --- a/cpp/test/Glacier2/staticFiltering/.depend.mak +++ b/cpp/test/Glacier2/staticFiltering/.depend.mak @@ -1,5 +1,5 @@ -Backend.cpp: \ +Backend.h: \ Backend.ice Backend.obj: \ diff --git a/cpp/test/Ice/acm/.depend.mak b/cpp/test/Ice/acm/.depend.mak index a87e74fd6c0..522ca7f15b1 100644 --- a/cpp/test/Ice/acm/.depend.mak +++ b/cpp/test/Ice/acm/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/adapterDeactivation/.depend.mak b/cpp/test/Ice/adapterDeactivation/.depend.mak index 389edffb15d..bea5e1642f7 100644 --- a/cpp/test/Ice/adapterDeactivation/.depend.mak +++ b/cpp/test/Ice/adapterDeactivation/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/admin/.depend.mak b/cpp/test/Ice/admin/.depend.mak index 9139c922b81..90e05b29fce 100644 --- a/cpp/test/Ice/admin/.depend.mak +++ b/cpp/test/Ice/admin/.depend.mak @@ -1,9 +1,9 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/Properties.ice \ - $(slicedir)/Ice/PropertiesAdmin.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/Ice/ami/.depend.mak b/cpp/test/Ice/ami/.depend.mak index 79c8a831cfe..e522d959c1e 100644 --- a/cpp/test/Ice/ami/.depend.mak +++ b/cpp/test/Ice/ami/.depend.mak @@ -1,10 +1,10 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Endpoint.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/EndpointF.ice + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/EndpointF.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/Ice/background/.depend.mak b/cpp/test/Ice/background/.depend.mak index 5acc3f39cca..d6f4b15fbf7 100644 --- a/cpp/test/Ice/background/.depend.mak +++ b/cpp/test/Ice/background/.depend.mak @@ -1,10 +1,10 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Endpoint.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/EndpointF.ice + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/EndpointF.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/Ice/binding/.depend.mak b/cpp/test/Ice/binding/.depend.mak index 98bd107410f..be849f7218f 100644 --- a/cpp/test/Ice/binding/.depend.mak +++ b/cpp/test/Ice/binding/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/checksum/.depend.mak b/cpp/test/Ice/checksum/.depend.mak index 0b8b03e577e..3da95a4ca3c 100644 --- a/cpp/test/Ice/checksum/.depend.mak +++ b/cpp/test/Ice/checksum/.depend.mak @@ -1,9 +1,9 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice + "$(slicedir)/Ice/SliceChecksumDict.ice" -Types.cpp: \ +Types.h: \ Types.ice Test.obj: \ diff --git a/cpp/test/Ice/checksum/server/.depend.mak b/cpp/test/Ice/checksum/server/.depend.mak index 8dd19522b76..dd7d4855da0 100644 --- a/cpp/test/Ice/checksum/server/.depend.mak +++ b/cpp/test/Ice/checksum/server/.depend.mak @@ -1,9 +1,9 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/SliceChecksumDict.ice + "$(slicedir)/Ice/SliceChecksumDict.ice" -Types.cpp: \ +Types.h: \ Types.ice Test.obj: \ diff --git a/cpp/test/Ice/custom/.depend.mak b/cpp/test/Ice/custom/.depend.mak index 3281e6a1d18..7e91bb0a003 100644 --- a/cpp/test/Ice/custom/.depend.mak +++ b/cpp/test/Ice/custom/.depend.mak @@ -1,14 +1,14 @@ -Test.cpp: \ +Test.h: \ Test.ice -TestAMD.cpp: \ +TestAMD.h: \ TestAMD.ice -Wstring.cpp: \ +Wstring.h: \ Wstring.ice -WstringAMD.cpp: \ +WstringAMD.h: \ WstringAMD.ice Test.obj: \ diff --git a/cpp/test/Ice/defaultServant/.depend.mak b/cpp/test/Ice/defaultServant/.depend.mak index cd8dbe3381c..52a6ce4a649 100644 --- a/cpp/test/Ice/defaultServant/.depend.mak +++ b/cpp/test/Ice/defaultServant/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/defaultValue/.depend.mak b/cpp/test/Ice/defaultValue/.depend.mak index 0c7aafb5923..db03e0b0936 100644 --- a/cpp/test/Ice/defaultValue/.depend.mak +++ b/cpp/test/Ice/defaultValue/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/dispatcher/.depend.mak b/cpp/test/Ice/dispatcher/.depend.mak index 353bcf8cc4c..e29bd7578e1 100644 --- a/cpp/test/Ice/dispatcher/.depend.mak +++ b/cpp/test/Ice/dispatcher/.depend.mak @@ -1,10 +1,10 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/BuiltinSequences.ice \ - $(slicedir)/Ice/Endpoint.ice \ - $(slicedir)/Ice/Version.ice \ - $(slicedir)/Ice/EndpointF.ice + "$(slicedir)/Ice/BuiltinSequences.ice" \ + "$(slicedir)/Ice/Endpoint.ice" \ + "$(slicedir)/Ice/Version.ice" \ + "$(slicedir)/Ice/EndpointF.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/Ice/echo/.depend.mak b/cpp/test/Ice/echo/.depend.mak index 2addfae01fd..7b65abb2fde 100644 --- a/cpp/test/Ice/echo/.depend.mak +++ b/cpp/test/Ice/echo/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/enums/.depend.mak b/cpp/test/Ice/enums/.depend.mak index 2afd423479a..8d999887481 100644 --- a/cpp/test/Ice/enums/.depend.mak +++ b/cpp/test/Ice/enums/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/exceptions/.depend.mak b/cpp/test/Ice/exceptions/.depend.mak index 09afa2c3d10..869f87f33fe 100644 --- a/cpp/test/Ice/exceptions/.depend.mak +++ b/cpp/test/Ice/exceptions/.depend.mak @@ -1,11 +1,11 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/BuiltinSequences.ice" -TestAMD.cpp: \ +TestAMD.h: \ TestAMD.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/BuiltinSequences.ice" ExceptionsI.obj: \ ExceptionsI.cpp \ diff --git a/cpp/test/Ice/facets/.depend.mak b/cpp/test/Ice/facets/.depend.mak index 26321aecc96..d2d82618f20 100644 --- a/cpp/test/Ice/facets/.depend.mak +++ b/cpp/test/Ice/facets/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/faultTolerance/.depend.mak b/cpp/test/Ice/faultTolerance/.depend.mak index d202126f57a..22bb9add198 100644 --- a/cpp/test/Ice/faultTolerance/.depend.mak +++ b/cpp/test/Ice/faultTolerance/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/gc/.depend.mak b/cpp/test/Ice/gc/.depend.mak index 529e772d7a4..9bf7b5720f9 100644 --- a/cpp/test/Ice/gc/.depend.mak +++ b/cpp/test/Ice/gc/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/hash/.depend.mak b/cpp/test/Ice/hash/.depend.mak index 6c22780a280..6f05a646987 100644 --- a/cpp/test/Ice/hash/.depend.mak +++ b/cpp/test/Ice/hash/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/hold/.depend.mak b/cpp/test/Ice/hold/.depend.mak index 7666e1ebc2c..8b4715e3393 100644 --- a/cpp/test/Ice/hold/.depend.mak +++ b/cpp/test/Ice/hold/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/info/.depend.mak b/cpp/test/Ice/info/.depend.mak index 2b25bedba1d..5a9fbd214b7 100644 --- a/cpp/test/Ice/info/.depend.mak +++ b/cpp/test/Ice/info/.depend.mak @@ -1,11 +1,11 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/Ice/inheritance/.depend.mak b/cpp/test/Ice/inheritance/.depend.mak index 7b765575a78..09208f36c2c 100644 --- a/cpp/test/Ice/inheritance/.depend.mak +++ b/cpp/test/Ice/inheritance/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/interceptor/.depend.mak b/cpp/test/Ice/interceptor/.depend.mak index 54870f5c61c..237652f2e16 100644 --- a/cpp/test/Ice/interceptor/.depend.mak +++ b/cpp/test/Ice/interceptor/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Client.obj: \ diff --git a/cpp/test/Ice/invoke/.depend.mak b/cpp/test/Ice/invoke/.depend.mak index d21d7883922..bed4930d859 100644 --- a/cpp/test/Ice/invoke/.depend.mak +++ b/cpp/test/Ice/invoke/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/location/.depend.mak b/cpp/test/Ice/location/.depend.mak index c3394a72314..92feb264ca4 100644 --- a/cpp/test/Ice/location/.depend.mak +++ b/cpp/test/Ice/location/.depend.mak @@ -1,9 +1,9 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/Locator.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/ProcessF.ice + "$(slicedir)/Ice/Locator.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/ProcessF.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/Ice/metrics/.depend.mak b/cpp/test/Ice/metrics/.depend.mak index 93caaacdbaa..bf227d468a9 100644 --- a/cpp/test/Ice/metrics/.depend.mak +++ b/cpp/test/Ice/metrics/.depend.mak @@ -1,8 +1,8 @@ -Test.cpp: \ +Test.h: \ Test.ice -TestAMD.cpp: \ +TestAMD.h: \ TestAMD.ice Test.obj: \ diff --git a/cpp/test/Ice/networkProxy/.depend.mak b/cpp/test/Ice/networkProxy/.depend.mak index 90fe8177014..fb5ca4e770e 100644 --- a/cpp/test/Ice/networkProxy/.depend.mak +++ b/cpp/test/Ice/networkProxy/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/objects/.depend.mak b/cpp/test/Ice/objects/.depend.mak index 2758e26fd70..88f12a841d1 100644 --- a/cpp/test/Ice/objects/.depend.mak +++ b/cpp/test/Ice/objects/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/operations/.depend.mak b/cpp/test/Ice/operations/.depend.mak index 742effe281e..85aa0842578 100644 --- a/cpp/test/Ice/operations/.depend.mak +++ b/cpp/test/Ice/operations/.depend.mak @@ -1,19 +1,19 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" -TestAMD.cpp: \ +TestAMD.h: \ TestAMD.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/Ice/optional/.depend.mak b/cpp/test/Ice/optional/.depend.mak index b0378f1a660..b6feefc65d7 100755 --- a/cpp/test/Ice/optional/.depend.mak +++ b/cpp/test/Ice/optional/.depend.mak @@ -1,8 +1,8 @@ -Test.cpp: \ +Test.h: \ Test.ice -TestAMD.cpp: \ +TestAMD.h: \ TestAMD.ice Test.obj: \ diff --git a/cpp/test/Ice/proxy/.depend.mak b/cpp/test/Ice/proxy/.depend.mak index 8487a888844..58274f2c367 100644 --- a/cpp/test/Ice/proxy/.depend.mak +++ b/cpp/test/Ice/proxy/.depend.mak @@ -1,19 +1,19 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" -TestAMD.cpp: \ +TestAMD.h: \ TestAMD.ice \ - $(slicedir)/Ice/Current.ice \ - $(slicedir)/Ice/ObjectAdapterF.ice \ - $(slicedir)/Ice/ConnectionF.ice \ - $(slicedir)/Ice/Identity.ice \ - $(slicedir)/Ice/Version.ice + "$(slicedir)/Ice/Current.ice" \ + "$(slicedir)/Ice/ObjectAdapterF.ice" \ + "$(slicedir)/Ice/ConnectionF.ice" \ + "$(slicedir)/Ice/Identity.ice" \ + "$(slicedir)/Ice/Version.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/Ice/retry/.depend.mak b/cpp/test/Ice/retry/.depend.mak index f8958043196..042c1ba9c06 100644 --- a/cpp/test/Ice/retry/.depend.mak +++ b/cpp/test/Ice/retry/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/servantLocator/.depend.mak b/cpp/test/Ice/servantLocator/.depend.mak index 3fa5490affe..cc09f9c472d 100644 --- a/cpp/test/Ice/servantLocator/.depend.mak +++ b/cpp/test/Ice/servantLocator/.depend.mak @@ -1,8 +1,8 @@ -Test.cpp: \ +Test.h: \ Test.ice -TestAMD.cpp: \ +TestAMD.h: \ TestAMD.ice Test.obj: \ diff --git a/cpp/test/Ice/slicing/exceptions/.depend.mak b/cpp/test/Ice/slicing/exceptions/.depend.mak index 24f0ec175b0..962c562a279 100644 --- a/cpp/test/Ice/slicing/exceptions/.depend.mak +++ b/cpp/test/Ice/slicing/exceptions/.depend.mak @@ -1,20 +1,20 @@ -ClientPrivate.cpp: \ +ClientPrivate.h: \ ClientPrivate.ice \ ./Test.ice -ServerPrivate.cpp: \ +ServerPrivate.h: \ ServerPrivate.ice \ ./Test.ice -ServerPrivateAMD.cpp: \ +ServerPrivateAMD.h: \ ServerPrivateAMD.ice \ ./TestAMD.ice -Test.cpp: \ +Test.h: \ Test.ice -TestAMD.cpp: \ +TestAMD.h: \ TestAMD.ice Test.obj: \ diff --git a/cpp/test/Ice/slicing/objects/.depend.mak b/cpp/test/Ice/slicing/objects/.depend.mak index c8e31effd28..55d4b26361f 100644 --- a/cpp/test/Ice/slicing/objects/.depend.mak +++ b/cpp/test/Ice/slicing/objects/.depend.mak @@ -1,23 +1,23 @@ -Test.cpp: \ +Test.h: \ Test.ice -TestAMD.cpp: \ +TestAMD.h: \ TestAMD.ice -ClientPrivate.cpp: \ +ClientPrivate.h: \ ClientPrivate.ice \ ./Test.ice -ServerPrivate.cpp: \ +ServerPrivate.h: \ ServerPrivate.ice \ ./Test.ice -ServerPrivateAMD.cpp: \ +ServerPrivateAMD.h: \ ServerPrivateAMD.ice \ ./TestAMD.ice -Forward.cpp: \ +Forward.h: \ Forward.ice Test.obj: \ diff --git a/cpp/test/Ice/stream/.depend.mak b/cpp/test/Ice/stream/.depend.mak index b3af667ba9e..883a186ebe1 100644 --- a/cpp/test/Ice/stream/.depend.mak +++ b/cpp/test/Ice/stream/.depend.mak @@ -1,7 +1,7 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/BuiltinSequences.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/Ice/stringConverter/.depend.mak b/cpp/test/Ice/stringConverter/.depend.mak index 7230706840a..7b7b9a26f03 100644 --- a/cpp/test/Ice/stringConverter/.depend.mak +++ b/cpp/test/Ice/stringConverter/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/threadPoolPriority/.depend.mak b/cpp/test/Ice/threadPoolPriority/.depend.mak index 3d28560bc90..4b017ad2ef9 100644 --- a/cpp/test/Ice/threadPoolPriority/.depend.mak +++ b/cpp/test/Ice/threadPoolPriority/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/timeout/.depend.mak b/cpp/test/Ice/timeout/.depend.mak index 998a354a3f2..ff7a66f03e2 100644 --- a/cpp/test/Ice/timeout/.depend.mak +++ b/cpp/test/Ice/timeout/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Ice/udp/.depend.mak b/cpp/test/Ice/udp/.depend.mak index 9f13c6be046..49b2bbb0063 100644 --- a/cpp/test/Ice/udp/.depend.mak +++ b/cpp/test/Ice/udp/.depend.mak @@ -1,7 +1,7 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/Identity.ice + "$(slicedir)/Ice/Identity.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/IceBox/admin/.depend.mak b/cpp/test/IceBox/admin/.depend.mak index 765e1cb81d9..35eec55a82a 100644 --- a/cpp/test/IceBox/admin/.depend.mak +++ b/cpp/test/IceBox/admin/.depend.mak @@ -1,9 +1,9 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/Properties.ice \ - $(slicedir)/Ice/PropertiesAdmin.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/Properties.ice" \ + "$(slicedir)/Ice/PropertiesAdmin.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/IceBox/configuration/.depend.mak b/cpp/test/IceBox/configuration/.depend.mak index b70a7b24879..f3b4eb4eb92 100644 --- a/cpp/test/IceBox/configuration/.depend.mak +++ b/cpp/test/IceBox/configuration/.depend.mak @@ -1,7 +1,7 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Ice/BuiltinSequences.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/IceDiscovery/simple/.depend.mak b/cpp/test/IceDiscovery/simple/.depend.mak index a87e74fd6c0..522ca7f15b1 100644 --- a/cpp/test/IceDiscovery/simple/.depend.mak +++ b/cpp/test/IceDiscovery/simple/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/IceGrid/activation/.depend.mak b/cpp/test/IceGrid/activation/.depend.mak index 64bef7d69be..9dc5781fdc2 100644 --- a/cpp/test/IceGrid/activation/.depend.mak +++ b/cpp/test/IceGrid/activation/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/IceGrid/allocation/.depend.mak b/cpp/test/IceGrid/allocation/.depend.mak index 695b18b844c..90993df19f4 100644 --- a/cpp/test/IceGrid/allocation/.depend.mak +++ b/cpp/test/IceGrid/allocation/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/IceGrid/deployer/.depend.mak b/cpp/test/IceGrid/deployer/.depend.mak index ef9f74aa056..cb4715c5743 100644 --- a/cpp/test/IceGrid/deployer/.depend.mak +++ b/cpp/test/IceGrid/deployer/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/IceGrid/distribution/.depend.mak b/cpp/test/IceGrid/distribution/.depend.mak index 4b96b5fb70a..6519b375e8b 100644 --- a/cpp/test/IceGrid/distribution/.depend.mak +++ b/cpp/test/IceGrid/distribution/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/IceGrid/noRestartUpdate/.depend.mak b/cpp/test/IceGrid/noRestartUpdate/.depend.mak index c3a777f6ed6..d78e259e214 100644 --- a/cpp/test/IceGrid/noRestartUpdate/.depend.mak +++ b/cpp/test/IceGrid/noRestartUpdate/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/IceGrid/replicaGroup/.depend.mak b/cpp/test/IceGrid/replicaGroup/.depend.mak index 4152b9ed2e1..1a567efb313 100644 --- a/cpp/test/IceGrid/replicaGroup/.depend.mak +++ b/cpp/test/IceGrid/replicaGroup/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/IceGrid/replication/.depend.mak b/cpp/test/IceGrid/replication/.depend.mak index 517e868a0c2..4b8af2adbc7 100644 --- a/cpp/test/IceGrid/replication/.depend.mak +++ b/cpp/test/IceGrid/replication/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/IceGrid/session/.depend.mak b/cpp/test/IceGrid/session/.depend.mak index f9e6e934c91..8224eee26a1 100644 --- a/cpp/test/IceGrid/session/.depend.mak +++ b/cpp/test/IceGrid/session/.depend.mak @@ -1,9 +1,9 @@ -Test.cpp: \ +Test.h: \ Test.ice \ - $(slicedir)/Glacier2/PermissionsVerifier.ice \ - $(slicedir)/Glacier2/SSLInfo.ice \ - $(slicedir)/Ice/BuiltinSequences.ice + "$(slicedir)/Glacier2/PermissionsVerifier.ice" \ + "$(slicedir)/Glacier2/SSLInfo.ice" \ + "$(slicedir)/Ice/BuiltinSequences.ice" Test.obj: \ Test.cpp \ diff --git a/cpp/test/IceGrid/simple/.depend.mak b/cpp/test/IceGrid/simple/.depend.mak index e1dacacade2..5ef746e03b2 100644 --- a/cpp/test/IceGrid/simple/.depend.mak +++ b/cpp/test/IceGrid/simple/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/IceGrid/update/.depend.mak b/cpp/test/IceGrid/update/.depend.mak index 4b96b5fb70a..6519b375e8b 100644 --- a/cpp/test/IceGrid/update/.depend.mak +++ b/cpp/test/IceGrid/update/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/IceSSL/configuration/.depend.mak b/cpp/test/IceSSL/configuration/.depend.mak index d34870e7e32..a09fc686430 100644 --- a/cpp/test/IceSSL/configuration/.depend.mak +++ b/cpp/test/IceSSL/configuration/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/IceStorm/federation/.depend.mak b/cpp/test/IceStorm/federation/.depend.mak index fbca987851f..c2a2f7a125d 100644 --- a/cpp/test/IceStorm/federation/.depend.mak +++ b/cpp/test/IceStorm/federation/.depend.mak @@ -1,5 +1,5 @@ -Event.cpp: \ +Event.h: \ Event.ice Event.obj: \ diff --git a/cpp/test/IceStorm/federation2/.depend.mak b/cpp/test/IceStorm/federation2/.depend.mak index 6bacb583bb9..4a663307329 100644 --- a/cpp/test/IceStorm/federation2/.depend.mak +++ b/cpp/test/IceStorm/federation2/.depend.mak @@ -1,5 +1,5 @@ -Event.cpp: \ +Event.h: \ Event.ice Event.obj: \ diff --git a/cpp/test/IceStorm/rep1/.depend.mak b/cpp/test/IceStorm/rep1/.depend.mak index e7216cdbc3d..b7616e5de7b 100644 --- a/cpp/test/IceStorm/rep1/.depend.mak +++ b/cpp/test/IceStorm/rep1/.depend.mak @@ -1,5 +1,5 @@ -Single.cpp: \ +Single.h: \ Single.ice Single.obj: \ diff --git a/cpp/test/IceStorm/repgrid/.depend.mak b/cpp/test/IceStorm/repgrid/.depend.mak index 38ac4c7f0f6..f9cf77b8d9f 100644 --- a/cpp/test/IceStorm/repgrid/.depend.mak +++ b/cpp/test/IceStorm/repgrid/.depend.mak @@ -1,5 +1,5 @@ -Single.cpp: \ +Single.h: \ Single.ice Single.obj: \ diff --git a/cpp/test/IceStorm/repstress/.depend.mak b/cpp/test/IceStorm/repstress/.depend.mak index 12076c6bfa2..98d0667a129 100644 --- a/cpp/test/IceStorm/repstress/.depend.mak +++ b/cpp/test/IceStorm/repstress/.depend.mak @@ -1,8 +1,8 @@ -Single.cpp: \ +Single.h: \ Single.ice -Controller.cpp: \ +Controller.h: \ Controller.ice Single.obj: \ diff --git a/cpp/test/IceStorm/single/.depend.mak b/cpp/test/IceStorm/single/.depend.mak index f4f317e02f4..8420ed7b9c9 100644 --- a/cpp/test/IceStorm/single/.depend.mak +++ b/cpp/test/IceStorm/single/.depend.mak @@ -1,5 +1,5 @@ -Single.cpp: \ +Single.h: \ Single.ice Single.obj: \ diff --git a/cpp/test/IceStorm/stress/.depend.mak b/cpp/test/IceStorm/stress/.depend.mak index 583a37152b0..cb406937670 100644 --- a/cpp/test/IceStorm/stress/.depend.mak +++ b/cpp/test/IceStorm/stress/.depend.mak @@ -1,5 +1,5 @@ -Event.cpp: \ +Event.h: \ Event.ice Event.obj: \ diff --git a/cpp/test/Slice/keyword/.depend.mak b/cpp/test/Slice/keyword/.depend.mak index be27e93035c..0d7ab176295 100644 --- a/cpp/test/Slice/keyword/.depend.mak +++ b/cpp/test/Slice/keyword/.depend.mak @@ -1,5 +1,5 @@ -Key.cpp: \ +Key.h: \ Key.ice Key.obj: \ diff --git a/cpp/test/Slice/macros/.depend.mak b/cpp/test/Slice/macros/.depend.mak index d8620e343a0..efb56624f49 100644 --- a/cpp/test/Slice/macros/.depend.mak +++ b/cpp/test/Slice/macros/.depend.mak @@ -1,5 +1,5 @@ -Test.cpp: \ +Test.h: \ Test.ice Test.obj: \ diff --git a/cpp/test/Slice/parser/.depend.mak b/cpp/test/Slice/parser/.depend.mak index a9be1a8cd8b..a922d5bd9d4 100644 --- a/cpp/test/Slice/parser/.depend.mak +++ b/cpp/test/Slice/parser/.depend.mak @@ -1,9 +1,9 @@ -CircularA.cpp: \ +CircularA.h: \ CircularA.ice \ ./CircularB.ice -CircularB.cpp: \ +CircularB.h: \ CircularB.ice \ ./CircularA.ice diff --git a/cpp/test/Slice/structure/.depend.mak b/cpp/test/Slice/structure/.depend.mak index b92c15608a6..bdbbd84aae5 100644 --- a/cpp/test/Slice/structure/.depend.mak +++ b/cpp/test/Slice/structure/.depend.mak @@ -1,8 +1,8 @@ -Test.cpp: \ +Test.h: \ Test.ice -Forward.cpp: \ +Forward.h: \ Forward.ice Test.obj: \ |