diff options
| author | Jose <jose@zeroc.com> | 2014-10-09 13:15:37 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-10-09 13:15:37 +0200 |
| commit | 456cbe7fdb2dc5ae67c1346e20dd43f0db7050d4 (patch) | |
| tree | 3cd72922bc926f8e91237415d5cabf0c2cd2ba62 /cpp | |
| parent | Windows JS build fixes (diff) | |
| download | ice-456cbe7fdb2dc5ae67c1346e20dd43f0db7050d4.tar.bz2 ice-456cbe7fdb2dc5ae67c1346e20dd43f0db7050d4.tar.xz ice-456cbe7fdb2dc5ae67c1346e20dd43f0db7050d4.zip | |
Fix Windows dependencies, break by previous dependencies update
Diffstat (limited to 'cpp')
88 files changed, 246 insertions, 230 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 03a75690cc1..dbec330d390 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -260,7 +260,7 @@ depend:: $(SLICE_SRCS) $(SLICE_OBJS_DEPEND) all::$(OBJS:.obj=.cpp) OBJS_DEPEND = $(OBJS:.obj=.d) OBJS_DEPEND = $(OBJS_DEPEND:.\=.depend.mak\) -depend:: $(OBJS:.obj=.cpp) $(OBJS_DEPEND) +depend:: $(OBJS:.obj=.cpp) $(RC_SRCS:.rc=.h) $(OBJS_DEPEND) !endif .cpp{$(DEPEND_DIR)}.d: diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index ca4fc842a70..75cf8c26a68 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -151,7 +151,7 @@ OBJS = .\Acceptor.obj \ HDIR = $(headerdir)\Ice SDIR = $(slicedir)\Ice -all:: EventLoggerMsg.h +RC_SRCS = EventLoggerMsg.rc !include $(top_srcdir)\config\Make.rules.mak diff --git a/cpp/test/Freeze/complex/.depend.mak b/cpp/test/Freeze/complex/.depend.mak index b9854a885fa..a0f366a04b6 100644 --- a/cpp/test/Freeze/complex/.depend.mak +++ b/cpp/test/Freeze/complex/.depend.mak @@ -470,7 +470,7 @@ Client.obj: \ "$(includedir)\Freeze\CatalogData.h" \ "ComplexDict.h" \ "Complex.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Freeze/dbmap/.depend.mak b/cpp/test/Freeze/dbmap/.depend.mak index 7c67e9d11fb..abe3211ebc8 100644 --- a/cpp/test/Freeze/dbmap/.depend.mak +++ b/cpp/test/Freeze/dbmap/.depend.mak @@ -740,7 +740,7 @@ Client.obj: \ "$(includedir)\Freeze\TransactionHolder.h" \ "$(includedir)\Freeze\Catalog.h" \ "$(includedir)\Freeze\CatalogData.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "ByteIntMap.h" \ "IntIdentityMap.h" \ "IntIdentityMapWithIndex.h" \ diff --git a/cpp/test/Freeze/evictor/.depend.mak b/cpp/test/Freeze/evictor/.depend.mak index e3c45dd618e..6dfd4ab56df 100644 --- a/cpp/test/Freeze/evictor/.depend.mak +++ b/cpp/test/Freeze/evictor/.depend.mak @@ -200,7 +200,7 @@ Client.obj: \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ "$(includedir)\IceUtil\Random.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "Test.h" \ TestI.obj: \ @@ -341,7 +341,7 @@ TestI.obj: \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ Server.obj: \ Server.cpp \ diff --git a/cpp/test/Freeze/fileLock/.depend.mak b/cpp/test/Freeze/fileLock/.depend.mak index e5404a97aee..6dd3e2898c3 100644 --- a/cpp/test/Freeze/fileLock/.depend.mak +++ b/cpp/test/Freeze/fileLock/.depend.mak @@ -135,7 +135,7 @@ Client.obj: \ "$(includedir)\Freeze\TransactionHolder.h" \ "$(includedir)\Freeze\Catalog.h" \ "$(includedir)\Freeze\CatalogData.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ ClientFail.obj: \ ClientFail.cpp \ @@ -273,4 +273,4 @@ ClientFail.obj: \ "$(includedir)\Freeze\TransactionHolder.h" \ "$(includedir)\Freeze\Catalog.h" \ "$(includedir)\Freeze\CatalogData.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Glacier2/attack/.depend.mak b/cpp/test/Glacier2/attack/.depend.mak index 1aa8c963e09..e70216296e0 100644 --- a/cpp/test/Glacier2/attack/.depend.mak +++ b/cpp/test/Glacier2/attack/.depend.mak @@ -311,7 +311,7 @@ Client.obj: \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "Backend.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Glacier2/dynamicFiltering/.depend.mak b/cpp/test/Glacier2/dynamicFiltering/.depend.mak index a527f2ad0f1..57821c3c1fb 100644 --- a/cpp/test/Glacier2/dynamicFiltering/.depend.mak +++ b/cpp/test/Glacier2/dynamicFiltering/.depend.mak @@ -204,7 +204,7 @@ Client.obj: \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Glacier2/override/.depend.mak b/cpp/test/Glacier2/override/.depend.mak index 2d6b859b7a0..228f306a417 100644 --- a/cpp/test/Glacier2/override/.depend.mak +++ b/cpp/test/Glacier2/override/.depend.mak @@ -192,7 +192,7 @@ CallbackI.obj: \ "$(includedir)\Ice\Service.h" \ "CallbackI.h" \ "Callback.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -326,7 +326,7 @@ Client.obj: \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "CallbackI.h" \ "Callback.h" \ diff --git a/cpp/test/Glacier2/router/.depend.mak b/cpp/test/Glacier2/router/.depend.mak index 4d48c6846ea..9904894563a 100644 --- a/cpp/test/Glacier2/router/.depend.mak +++ b/cpp/test/Glacier2/router/.depend.mak @@ -194,7 +194,7 @@ CallbackI.obj: \ "$(includedir)\Ice\Service.h" \ "CallbackI.h" \ "Callback.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -329,7 +329,7 @@ Client.obj: \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "CallbackI.h" \ "Callback.h" \ diff --git a/cpp/test/Glacier2/sessionControl/.depend.mak b/cpp/test/Glacier2/sessionControl/.depend.mak index 612d1a39567..a4b0069fcac 100644 --- a/cpp/test/Glacier2/sessionControl/.depend.mak +++ b/cpp/test/Glacier2/sessionControl/.depend.mak @@ -205,7 +205,7 @@ Client.obj: \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "Session.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -452,7 +452,7 @@ SessionI.obj: \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Glacier2/sessionHelper/.depend.mak b/cpp/test/Glacier2/sessionHelper/.depend.mak index 0140f5534f0..f71e2e03359 100644 --- a/cpp/test/Glacier2/sessionHelper/.depend.mak +++ b/cpp/test/Glacier2/sessionHelper/.depend.mak @@ -206,7 +206,7 @@ Client.obj: \ "$(includedir)\Glacier2\Metrics.h" \ "$(includedir)\Glacier2\Application.h" \ "$(includedir)\Glacier2\SessionHelper.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "Callback.h" \ Server.obj: \ diff --git a/cpp/test/Glacier2/ssl/.depend.mak b/cpp/test/Glacier2/ssl/.depend.mak index 58a8e91876a..2b3917cfbf5 100644 --- a/cpp/test/Glacier2/ssl/.depend.mak +++ b/cpp/test/Glacier2/ssl/.depend.mak @@ -117,7 +117,7 @@ Client.obj: \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -243,7 +243,7 @@ Server.obj: \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\Glacier2\Session.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Glacier2/staticFiltering/.depend.mak b/cpp/test/Glacier2/staticFiltering/.depend.mak index b2db5cd5279..7600beb92c4 100644 --- a/cpp/test/Glacier2/staticFiltering/.depend.mak +++ b/cpp/test/Glacier2/staticFiltering/.depend.mak @@ -310,7 +310,7 @@ Client.obj: \ "$(includedir)\Glacier2\Config.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "Backend.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/acm/.depend.mak b/cpp/test/Ice/acm/.depend.mak index d0c5e5aa428..7b3d394a743 100644 --- a/cpp/test/Ice/acm/.depend.mak +++ b/cpp/test/Ice/acm/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -311,7 +311,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -557,7 +557,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/adapterDeactivation/.depend.mak b/cpp/test/Ice/adapterDeactivation/.depend.mak index 14c8fd2bc10..cbcbc3a87c5 100644 --- a/cpp/test/Ice/adapterDeactivation/.depend.mak +++ b/cpp/test/Ice/adapterDeactivation/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -311,7 +311,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -558,7 +558,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -683,7 +683,7 @@ Server.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ "ServantLocatorI.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -806,7 +806,7 @@ Collocated.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ "ServantLocatorI.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/admin/.depend.mak b/cpp/test/Ice/admin/.depend.mak index be172961935..72c174954a5 100644 --- a/cpp/test/Ice/admin/.depend.mak +++ b/cpp/test/Ice/admin/.depend.mak @@ -194,7 +194,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -317,7 +317,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -559,7 +559,7 @@ Server.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/ami/.depend.mak b/cpp/test/Ice/ami/.depend.mak index 32a97f85b06..26dccf3a8fb 100644 --- a/cpp/test/Ice/ami/.depend.mak +++ b/cpp/test/Ice/ami/.depend.mak @@ -195,7 +195,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -319,7 +319,7 @@ AllTests.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\IceUtil\Random.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -558,7 +558,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -682,7 +682,7 @@ Collocated.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/background/.depend.mak b/cpp/test/Ice/background/.depend.mak index 6b2d2e8e58b..54b6d9c24f7 100644 --- a/cpp/test/Ice/background/.depend.mak +++ b/cpp/test/Ice/background/.depend.mak @@ -866,7 +866,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1005,7 +1005,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "Test.h" \ "PluginI.h" \ "Configuration.h" \ diff --git a/cpp/test/Ice/binding/.depend.mak b/cpp/test/Ice/binding/.depend.mak index ca5434c9ff1..812ed46e849 100644 --- a/cpp/test/Ice/binding/.depend.mak +++ b/cpp/test/Ice/binding/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -312,7 +312,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -551,7 +551,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/checksum/.depend.mak b/cpp/test/Ice/checksum/.depend.mak index b32e0fd998e..bf54fa44be1 100644 --- a/cpp/test/Ice/checksum/.depend.mak +++ b/cpp/test/Ice/checksum/.depend.mak @@ -271,7 +271,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -397,7 +397,7 @@ AllTests.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\SliceChecksums.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/checksum/server/.depend.mak b/cpp/test/Ice/checksum/server/.depend.mak index 6645cabdd6e..c5f126b5037 100644 --- a/cpp/test/Ice/checksum/server/.depend.mak +++ b/cpp/test/Ice/checksum/server/.depend.mak @@ -392,7 +392,7 @@ Server.obj: \ "TestI.h" \ "Test.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/custom/.depend.mak b/cpp/test/Ice/custom/.depend.mak index e9d8c79919d..add883b4f45 100644 --- a/cpp/test/Ice/custom/.depend.mak +++ b/cpp/test/Ice/custom/.depend.mak @@ -318,7 +318,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -446,7 +446,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -783,7 +783,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1304,7 +1304,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1435,7 +1435,7 @@ Collocated.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/defaultServant/.depend.mak b/cpp/test/Ice/defaultServant/.depend.mak index 72c6dbc603f..4fc5ae9265a 100644 --- a/cpp/test/Ice/defaultServant/.depend.mak +++ b/cpp/test/Ice/defaultServant/.depend.mak @@ -304,7 +304,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -427,7 +427,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/defaultValue/.depend.mak b/cpp/test/Ice/defaultValue/.depend.mak index 023194199bb..f32da1b9350 100644 --- a/cpp/test/Ice/defaultValue/.depend.mak +++ b/cpp/test/Ice/defaultValue/.depend.mak @@ -190,7 +190,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -313,7 +313,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/dispatcher/.depend.mak b/cpp/test/Ice/dispatcher/.depend.mak index b95aefa7efc..f4121c8a692 100644 --- a/cpp/test/Ice/dispatcher/.depend.mak +++ b/cpp/test/Ice/dispatcher/.depend.mak @@ -193,7 +193,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -318,7 +318,7 @@ AllTests.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\IceUtil\Random.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -361,7 +361,7 @@ Dispatcher.obj: \ "$(includedir)\IceUtil\Iterator.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -491,7 +491,7 @@ TestI.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ "Dispatcher.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -615,7 +615,7 @@ Server.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -738,7 +738,7 @@ Collocated.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/echo/.depend.mak b/cpp/test/Ice/echo/.depend.mak index 6ef5d809bc5..b6fb5515e31 100644 --- a/cpp/test/Ice/echo/.depend.mak +++ b/cpp/test/Ice/echo/.depend.mak @@ -303,7 +303,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/enums/.depend.mak b/cpp/test/Ice/enums/.depend.mak index b97317d209c..83d6b9b5790 100644 --- a/cpp/test/Ice/enums/.depend.mak +++ b/cpp/test/Ice/enums/.depend.mak @@ -189,7 +189,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -312,7 +312,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -551,7 +551,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/exceptions/.depend.mak b/cpp/test/Ice/exceptions/.depend.mak index de330ffcaa3..6993f4591b7 100644 --- a/cpp/test/Ice/exceptions/.depend.mak +++ b/cpp/test/Ice/exceptions/.depend.mak @@ -269,7 +269,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -392,7 +392,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -517,7 +517,7 @@ TestI.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -639,7 +639,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -841,7 +841,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Service.h" \ "TestAMDI.h" \ "TestAMD.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -963,7 +963,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1087,7 +1087,7 @@ Collocated.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/facets/.depend.mak b/cpp/test/Ice/facets/.depend.mak index 93b4fb382be..a13d0dff68c 100644 --- a/cpp/test/Ice/facets/.depend.mak +++ b/cpp/test/Ice/facets/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -318,7 +318,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "Test.h" \ TestI.obj: \ @@ -550,7 +550,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -674,7 +674,7 @@ Collocated.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/faultTolerance/.depend.mak b/cpp/test/Ice/faultTolerance/.depend.mak index bc428476f0d..ffd68e63f9e 100644 --- a/cpp/test/Ice/faultTolerance/.depend.mak +++ b/cpp/test/Ice/faultTolerance/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -311,7 +311,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/gc/.depend.mak b/cpp/test/Ice/gc/.depend.mak index 497221efc4e..8586dd10753 100644 --- a/cpp/test/Ice/gc/.depend.mak +++ b/cpp/test/Ice/gc/.depend.mak @@ -191,7 +191,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/hash/.depend.mak b/cpp/test/Ice/hash/.depend.mak index 0c02278fc89..8ec0726c329 100644 --- a/cpp/test/Ice/hash/.depend.mak +++ b/cpp/test/Ice/hash/.depend.mak @@ -192,7 +192,7 @@ Client.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\IceUtil\Random.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/hold/.depend.mak b/cpp/test/Ice/hold/.depend.mak index 28a8e678809..a5a3129c3cc 100644 --- a/cpp/test/Ice/hold/.depend.mak +++ b/cpp/test/Ice/hold/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -312,7 +312,7 @@ AllTests.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\IceUtil\Random.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -444,7 +444,7 @@ TestI.obj: \ "$(includedir)\IceUtil\UUID.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ Server.obj: \ Server.cpp \ @@ -559,7 +559,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/info/.depend.mak b/cpp/test/Ice/info/.depend.mak index 9fa6fc3edc4..d9a5315429c 100644 --- a/cpp/test/Ice/info/.depend.mak +++ b/cpp/test/Ice/info/.depend.mak @@ -198,7 +198,7 @@ TestI.obj: \ "$(includedir)\IceSSL\Config.h" \ "$(includedir)\IceSSL\ConnectionInfo.h" \ "$(includedir)\IceSSL\EndpointInfo.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -322,7 +322,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -450,7 +450,7 @@ AllTests.obj: \ "$(includedir)\IceSSL\Config.h" \ "$(includedir)\IceSSL\ConnectionInfo.h" \ "$(includedir)\IceSSL\EndpointInfo.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -574,7 +574,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/inheritance/.depend.mak b/cpp/test/Ice/inheritance/.depend.mak index 23717adc7fa..aefa7a053e8 100644 --- a/cpp/test/Ice/inheritance/.depend.mak +++ b/cpp/test/Ice/inheritance/.depend.mak @@ -190,7 +190,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -313,7 +313,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -552,7 +552,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -676,7 +676,7 @@ Collocated.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/interceptor/.depend.mak b/cpp/test/Ice/interceptor/.depend.mak index c8b00c069fd..96e2da721cd 100644 --- a/cpp/test/Ice/interceptor/.depend.mak +++ b/cpp/test/Ice/interceptor/.depend.mak @@ -115,7 +115,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -250,7 +250,7 @@ InterceptorI.obj: \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ AMDInterceptorI.obj: \ AMDInterceptorI.cpp \ @@ -376,7 +376,7 @@ AMDInterceptorI.obj: \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ MyObjectI.obj: \ MyObjectI.cpp \ @@ -493,7 +493,7 @@ MyObjectI.obj: \ "$(includedir)\Ice\Service.h" \ "MyObjectI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/invoke/.depend.mak b/cpp/test/Ice/invoke/.depend.mak index 1c99af93769..616d4a659a4 100644 --- a/cpp/test/Ice/invoke/.depend.mak +++ b/cpp/test/Ice/invoke/.depend.mak @@ -190,7 +190,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -313,7 +313,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -438,7 +438,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\Service.h" \ "BlobjectI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -560,7 +560,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/location/.depend.mak b/cpp/test/Ice/location/.depend.mak index 668233fb940..d96efe087fc 100644 --- a/cpp/test/Ice/location/.depend.mak +++ b/cpp/test/Ice/location/.depend.mak @@ -196,7 +196,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -326,7 +326,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "Test.h" \ TestI.obj: \ @@ -559,7 +559,7 @@ ServerLocator.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -685,7 +685,7 @@ Server.obj: \ "$(includedir)\Ice\Service.h" \ "ServerLocator.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/logger/.depend.mak b/cpp/test/Ice/logger/.depend.mak index eb9a25a6481..a9181ef2a52 100644 --- a/cpp/test/Ice/logger/.depend.mak +++ b/cpp/test/Ice/logger/.depend.mak @@ -112,7 +112,7 @@ Client1.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -234,7 +234,7 @@ Client2.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -356,7 +356,7 @@ Client3.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -478,7 +478,7 @@ Client4.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/metrics/.depend.mak b/cpp/test/Ice/metrics/.depend.mak index 1b630d8ba42..a2436b7cdca 100644 --- a/cpp/test/Ice/metrics/.depend.mak +++ b/cpp/test/Ice/metrics/.depend.mak @@ -193,7 +193,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -317,7 +317,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -557,7 +557,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -873,7 +873,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/networkProxy/.depend.mak b/cpp/test/Ice/networkProxy/.depend.mak index 533cd262c0f..f7a5b0ef399 100644 --- a/cpp/test/Ice/networkProxy/.depend.mak +++ b/cpp/test/Ice/networkProxy/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -311,7 +311,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -434,7 +434,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/objects/.depend.mak b/cpp/test/Ice/objects/.depend.mak index eb8d0f28b07..43f144932dd 100644 --- a/cpp/test/Ice/objects/.depend.mak +++ b/cpp/test/Ice/objects/.depend.mak @@ -306,7 +306,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -430,7 +430,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -553,7 +553,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -677,7 +677,7 @@ Collocated.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/operations/.depend.mak b/cpp/test/Ice/operations/.depend.mak index f7c9f0cd1fe..0ed7b52b1ca 100644 --- a/cpp/test/Ice/operations/.depend.mak +++ b/cpp/test/Ice/operations/.depend.mak @@ -203,7 +203,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -326,7 +326,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -449,7 +449,7 @@ Twoways.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -572,7 +572,7 @@ Oneways.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -695,7 +695,7 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -818,7 +818,7 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -941,7 +941,7 @@ BatchOneways.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1064,7 +1064,7 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1196,7 +1196,7 @@ TestI.obj: \ "$(includedir)\IceUtil\UUID.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ Server.obj: \ Server.cpp \ @@ -1311,7 +1311,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1511,7 +1511,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Service.h" \ "TestAMDI.h" \ "TestAMD.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1633,7 +1633,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1757,7 +1757,7 @@ Collocated.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/optional/.depend.mak b/cpp/test/Ice/optional/.depend.mak index 4fedb9086fa..4a1852728de 100644 --- a/cpp/test/Ice/optional/.depend.mak +++ b/cpp/test/Ice/optional/.depend.mak @@ -350,7 +350,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -476,7 +476,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -601,7 +601,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/plugin/.depend.mak b/cpp/test/Ice/plugin/.depend.mak index 86d79d96969..04c75895ba2 100644 --- a/cpp/test/Ice/plugin/.depend.mak +++ b/cpp/test/Ice/plugin/.depend.mak @@ -112,7 +112,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -234,7 +234,7 @@ Plugin.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/properties/.depend.mak b/cpp/test/Ice/properties/.depend.mak index 13ba2084bf4..b466fe6d247 100644 --- a/cpp/test/Ice/properties/.depend.mak +++ b/cpp/test/Ice/properties/.depend.mak @@ -112,7 +112,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/proxy/.depend.mak b/cpp/test/Ice/proxy/.depend.mak index 43e667dd74a..671c72588f4 100644 --- a/cpp/test/Ice/proxy/.depend.mak +++ b/cpp/test/Ice/proxy/.depend.mak @@ -201,7 +201,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -324,7 +324,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -449,7 +449,7 @@ TestI.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -571,7 +571,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -771,7 +771,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Service.h" \ "TestAMDI.h" \ "TestAMD.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -893,7 +893,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1017,7 +1017,7 @@ Collocated.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/retry/.depend.mak b/cpp/test/Ice/retry/.depend.mak index 66736d92d3f..6bb7077fe71 100644 --- a/cpp/test/Ice/retry/.depend.mak +++ b/cpp/test/Ice/retry/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -312,7 +312,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -434,7 +434,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -676,7 +676,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -800,7 +800,7 @@ Collocated.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/servantLocator/.depend.mak b/cpp/test/Ice/servantLocator/.depend.mak index c7f2ade5d62..3ad3f6b3076 100644 --- a/cpp/test/Ice/servantLocator/.depend.mak +++ b/cpp/test/Ice/servantLocator/.depend.mak @@ -193,7 +193,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -316,7 +316,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -564,7 +564,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -687,7 +687,7 @@ Server.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ "ServantLocatorI.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1011,7 +1011,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ "ServantLocatorI.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1136,7 +1136,7 @@ Collocated.obj: \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ "ServantLocatorI.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/slicing/exceptions/.depend.mak b/cpp/test/Ice/slicing/exceptions/.depend.mak index ba245180485..2b0520f931c 100644 --- a/cpp/test/Ice/slicing/exceptions/.depend.mak +++ b/cpp/test/Ice/slicing/exceptions/.depend.mak @@ -206,7 +206,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -406,7 +406,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -610,7 +610,7 @@ TestI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -735,7 +735,7 @@ Server.obj: \ "TestI.h" \ "ServerPrivate.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1015,7 +1015,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1140,7 +1140,7 @@ ServerAMD.obj: \ "TestAMDI.h" \ "ServerPrivateAMD.h" \ "TestAMD.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/slicing/objects/.depend.mak b/cpp/test/Ice/slicing/objects/.depend.mak index 00a1a8909e7..b1a1b97020b 100644 --- a/cpp/test/Ice/slicing/objects/.depend.mak +++ b/cpp/test/Ice/slicing/objects/.depend.mak @@ -288,7 +288,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -412,7 +412,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -693,7 +693,7 @@ TestI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -819,7 +819,7 @@ Server.obj: \ "ServerPrivate.h" \ "Test.h" \ "Forward.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1100,7 +1100,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -1226,7 +1226,7 @@ ServerAMD.obj: \ "ServerPrivateAMD.h" \ "TestAMD.h" \ "Forward.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/stream/.depend.mak b/cpp/test/Ice/stream/.depend.mak index 3c8940c9711..60e434ab4ee 100644 --- a/cpp/test/Ice/stream/.depend.mak +++ b/cpp/test/Ice/stream/.depend.mak @@ -192,7 +192,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/stringConverter/.depend.mak b/cpp/test/Ice/stringConverter/.depend.mak index 4945a964f48..25bc4fc91e2 100644 --- a/cpp/test/Ice/stringConverter/.depend.mak +++ b/cpp/test/Ice/stringConverter/.depend.mak @@ -190,7 +190,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -313,7 +313,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/threadPoolPriority/.depend.mak b/cpp/test/Ice/threadPoolPriority/.depend.mak index 723161dc77d..5d97d161691 100644 --- a/cpp/test/Ice/threadPoolPriority/.depend.mak +++ b/cpp/test/Ice/threadPoolPriority/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -311,7 +311,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -552,7 +552,7 @@ Server.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -676,7 +676,7 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/timeout/.depend.mak b/cpp/test/Ice/timeout/.depend.mak index 8fb7a702bb7..8818e689910 100644 --- a/cpp/test/Ice/timeout/.depend.mak +++ b/cpp/test/Ice/timeout/.depend.mak @@ -304,7 +304,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -427,7 +427,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -551,7 +551,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Ice/udp/.depend.mak b/cpp/test/Ice/udp/.depend.mak index 92782f83630..2b40aa8353b 100644 --- a/cpp/test/Ice/udp/.depend.mak +++ b/cpp/test/Ice/udp/.depend.mak @@ -189,7 +189,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -312,7 +312,7 @@ AllTests.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -558,7 +558,7 @@ Server.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceBox/admin/.depend.mak b/cpp/test/IceBox/admin/.depend.mak index 6eb4e5ffe50..1e84b12b600 100644 --- a/cpp/test/IceBox/admin/.depend.mak +++ b/cpp/test/IceBox/admin/.depend.mak @@ -558,5 +558,6 @@ Service.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\IceBox\Config.h" \ "TestI.h" \ "Test.h" \ diff --git a/cpp/test/IceBox/configuration/.depend.mak b/cpp/test/IceBox/configuration/.depend.mak index a74c3e3fbc4..dedcda93dce 100644 --- a/cpp/test/IceBox/configuration/.depend.mak +++ b/cpp/test/IceBox/configuration/.depend.mak @@ -553,5 +553,6 @@ Service.obj: \ "$(includedir)\Ice\Service.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\IceBox\Config.h" \ "TestI.h" \ "Test.h" \ diff --git a/cpp/test/IceGrid/activation/.depend.mak b/cpp/test/IceGrid/activation/.depend.mak index add089f7ba0..fdeb4fc48de 100644 --- a/cpp/test/IceGrid/activation/.depend.mak +++ b/cpp/test/IceGrid/activation/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -329,7 +329,7 @@ AllTests.obj: \ "$(includedir)\IceGrid\UserAccountMapper.h" \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(includedir)\IceGrid\Discovery.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceGrid/allocation/.depend.mak b/cpp/test/IceGrid/allocation/.depend.mak index 7dde234c9ab..e1f7edc337e 100644 --- a/cpp/test/IceGrid/allocation/.depend.mak +++ b/cpp/test/IceGrid/allocation/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -332,7 +332,7 @@ AllTests.obj: \ "$(includedir)\IceGrid\Discovery.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -573,7 +573,7 @@ Server.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceGrid/deployer/.depend.mak b/cpp/test/IceGrid/deployer/.depend.mak index badff8e80d2..645026d15fb 100644 --- a/cpp/test/IceGrid/deployer/.depend.mak +++ b/cpp/test/IceGrid/deployer/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -329,7 +329,7 @@ AllTests.obj: \ "$(includedir)\IceGrid\UserAccountMapper.h" \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(includedir)\IceGrid\Discovery.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -571,7 +571,7 @@ Server.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceGrid/distribution/.depend.mak b/cpp/test/IceGrid/distribution/.depend.mak index 5502deedfb8..8b1eb443d5c 100644 --- a/cpp/test/IceGrid/distribution/.depend.mak +++ b/cpp/test/IceGrid/distribution/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -329,7 +329,7 @@ AllTests.obj: \ "$(includedir)\IceGrid\UserAccountMapper.h" \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(includedir)\IceGrid\Discovery.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -570,7 +570,7 @@ Server.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceGrid/noRestartUpdate/.depend.mak b/cpp/test/IceGrid/noRestartUpdate/.depend.mak index df3731e1c48..985644640d1 100644 --- a/cpp/test/IceGrid/noRestartUpdate/.depend.mak +++ b/cpp/test/IceGrid/noRestartUpdate/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -329,7 +329,7 @@ AllTests.obj: \ "$(includedir)\IceGrid\UserAccountMapper.h" \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(includedir)\IceGrid\Discovery.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -570,7 +570,7 @@ Server.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceGrid/replicaGroup/.depend.mak b/cpp/test/IceGrid/replicaGroup/.depend.mak index e8837551c5f..23695790f14 100644 --- a/cpp/test/IceGrid/replicaGroup/.depend.mak +++ b/cpp/test/IceGrid/replicaGroup/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -329,7 +329,7 @@ AllTests.obj: \ "$(includedir)\IceGrid\UserAccountMapper.h" \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(includedir)\IceGrid\Discovery.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -570,7 +570,7 @@ Server.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceGrid/replication/.depend.mak b/cpp/test/IceGrid/replication/.depend.mak index b09cb071130..5faa8e0333a 100644 --- a/cpp/test/IceGrid/replication/.depend.mak +++ b/cpp/test/IceGrid/replication/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -329,7 +329,7 @@ AllTests.obj: \ "$(includedir)\IceGrid\UserAccountMapper.h" \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(includedir)\IceGrid\Discovery.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -570,7 +570,7 @@ Server.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceGrid/session/.depend.mak b/cpp/test/IceGrid/session/.depend.mak index f920355d5ee..27feb6af79e 100644 --- a/cpp/test/IceGrid/session/.depend.mak +++ b/cpp/test/IceGrid/session/.depend.mak @@ -197,7 +197,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -339,7 +339,7 @@ AllTests.obj: \ "$(includedir)\IceGrid\Discovery.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -468,7 +468,7 @@ Server.obj: \ "$(includedir)\IceSSL\Plugin.h" \ "$(includedir)\IceSSL\Config.h" \ "$(includedir)\IceSSL\ConnectionInfo.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceGrid/simple/.depend.mak b/cpp/test/IceGrid/simple/.depend.mak index 211e096875d..ce1d2e6ad8c 100644 --- a/cpp/test/IceGrid/simple/.depend.mak +++ b/cpp/test/IceGrid/simple/.depend.mak @@ -195,7 +195,7 @@ Client.obj: \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "Test.h" \ AllTests.obj: \ @@ -336,7 +336,7 @@ AllTests.obj: \ "$(includedir)\IceGrid\UserAccountMapper.h" \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(includedir)\IceGrid\Discovery.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "Test.h" \ TestI.obj: \ diff --git a/cpp/test/IceGrid/update/.depend.mak b/cpp/test/IceGrid/update/.depend.mak index 5502deedfb8..8b1eb443d5c 100644 --- a/cpp/test/IceGrid/update/.depend.mak +++ b/cpp/test/IceGrid/update/.depend.mak @@ -188,7 +188,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -329,7 +329,7 @@ AllTests.obj: \ "$(includedir)\IceGrid\UserAccountMapper.h" \ "$(includedir)\IceGrid\PluginFacade.h" \ "$(includedir)\IceGrid\Discovery.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -570,7 +570,7 @@ Server.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceSSL/configuration/.depend.mak b/cpp/test/IceSSL/configuration/.depend.mak index 817d24a12d4..6827d6acce1 100644 --- a/cpp/test/IceSSL/configuration/.depend.mak +++ b/cpp/test/IceSSL/configuration/.depend.mak @@ -310,7 +310,7 @@ AllTests.obj: \ "$(includedir)\IceSSL\Plugin.h" \ "$(includedir)\IceSSL\Config.h" \ "$(includedir)\IceSSL\ConnectionInfo.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -438,7 +438,7 @@ TestI.obj: \ "$(includedir)\Ice\Service.h" \ "TestI.h" \ "Test.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceStorm/federation/.depend.mak b/cpp/test/IceStorm/federation/.depend.mak index 6dce23c6b74..b2251606189 100644 --- a/cpp/test/IceStorm/federation/.depend.mak +++ b/cpp/test/IceStorm/federation/.depend.mak @@ -191,6 +191,7 @@ Publisher.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Event.h" \ Subscriber.obj: \ @@ -310,6 +311,7 @@ Subscriber.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Event.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ diff --git a/cpp/test/IceStorm/federation2/.depend.mak b/cpp/test/IceStorm/federation2/.depend.mak index adde0e2b41e..62ed6b9baf0 100644 --- a/cpp/test/IceStorm/federation2/.depend.mak +++ b/cpp/test/IceStorm/federation2/.depend.mak @@ -199,6 +199,7 @@ Publisher.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Event.h" \ Subscriber.obj: \ @@ -318,6 +319,7 @@ Subscriber.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Event.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ diff --git a/cpp/test/IceStorm/rep1/.depend.mak b/cpp/test/IceStorm/rep1/.depend.mak index de0a9dcbd1c..41e3b63e6e2 100644 --- a/cpp/test/IceStorm/rep1/.depend.mak +++ b/cpp/test/IceStorm/rep1/.depend.mak @@ -199,6 +199,7 @@ Publisher.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Single.h" \ Subscriber.obj: \ @@ -326,6 +327,7 @@ Subscriber.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Single.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -454,5 +456,6 @@ Sub.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Single.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/IceStorm/repgrid/.depend.mak b/cpp/test/IceStorm/repgrid/.depend.mak index 0fb9f798ee6..e2c33228286 100644 --- a/cpp/test/IceStorm/repgrid/.depend.mak +++ b/cpp/test/IceStorm/repgrid/.depend.mak @@ -192,6 +192,7 @@ Client.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Single.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ diff --git a/cpp/test/IceStorm/repstress/.depend.mak b/cpp/test/IceStorm/repstress/.depend.mak index e80a10d64b2..468c9d46777 100644 --- a/cpp/test/IceStorm/repstress/.depend.mak +++ b/cpp/test/IceStorm/repstress/.depend.mak @@ -274,6 +274,7 @@ Publisher.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Single.h" \ "Controller.h" \ @@ -401,6 +402,7 @@ Subscriber.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Single.h" \ "Controller.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/IceStorm/single/.depend.mak b/cpp/test/IceStorm/single/.depend.mak index 96a93d0d1b1..be8df8770e0 100644 --- a/cpp/test/IceStorm/single/.depend.mak +++ b/cpp/test/IceStorm/single/.depend.mak @@ -191,6 +191,7 @@ Publisher.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Single.h" \ Subscriber.obj: \ @@ -310,6 +311,7 @@ Subscriber.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Single.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ diff --git a/cpp/test/IceStorm/stress/.depend.mak b/cpp/test/IceStorm/stress/.depend.mak index cdcd4ed4264..1c38e39991f 100644 --- a/cpp/test/IceStorm/stress/.depend.mak +++ b/cpp/test/IceStorm/stress/.depend.mak @@ -193,6 +193,7 @@ Publisher.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "Event.h" \ Subscriber.obj: \ @@ -312,6 +313,7 @@ Subscriber.obj: \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\IceStorm\Metrics.h" \ + "$(includedir)\IceStorm\Config.h" \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\Random.h" \ diff --git a/cpp/test/IceUtil/ctrlCHandler/.depend.mak b/cpp/test/IceUtil/ctrlCHandler/.depend.mak index 2736e549f57..ee7c9413ed6 100644 --- a/cpp/test/IceUtil/ctrlCHandler/.depend.mak +++ b/cpp/test/IceUtil/ctrlCHandler/.depend.mak @@ -1,7 +1,7 @@ Client.obj: \ Client.cpp \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\Config.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ diff --git a/cpp/test/IceUtil/inputUtil/.depend.mak b/cpp/test/IceUtil/inputUtil/.depend.mak index f549e228218..2bf782d1755 100644 --- a/cpp/test/IceUtil/inputUtil/.depend.mak +++ b/cpp/test/IceUtil/inputUtil/.depend.mak @@ -13,7 +13,7 @@ Client.obj: \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Handle.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceUtil/priority/.depend.mak b/cpp/test/IceUtil/priority/.depend.mak index e7b6fa41a5d..79a64ec9f2f 100644 --- a/cpp/test/IceUtil/priority/.depend.mak +++ b/cpp/test/IceUtil/priority/.depend.mak @@ -57,7 +57,7 @@ ThreadPriority.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "ThreadPriority.h" \ "TestBase.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ TimerPriority.obj: \ TimerPriority.cpp \ @@ -88,7 +88,7 @@ TimerPriority.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "TimerPriority.h" \ "TestBase.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ PriorityInversion.obj: \ PriorityInversion.cpp \ @@ -107,7 +107,7 @@ PriorityInversion.obj: \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\RecMutex.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ @@ -160,6 +160,6 @@ Client.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\UUID.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "TestSuite.h" \ "TestBase.h" \ diff --git a/cpp/test/IceUtil/sha1/.depend.mak b/cpp/test/IceUtil/sha1/.depend.mak index 53365c97382..da4c49f5d0f 100644 --- a/cpp/test/IceUtil/sha1/.depend.mak +++ b/cpp/test/IceUtil/sha1/.depend.mak @@ -3,7 +3,7 @@ Client.obj: \ Client.cpp \ "$(includedir)\IceUtil\SHA1.h" \ "$(includedir)\IceUtil\Config.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Lock.h" \ diff --git a/cpp/test/IceUtil/thread/.depend.mak b/cpp/test/IceUtil/thread/.depend.mak index a70666e21f5..55b755cab17 100644 --- a/cpp/test/IceUtil/thread/.depend.mak +++ b/cpp/test/IceUtil/thread/.depend.mak @@ -58,7 +58,7 @@ CreateTest.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "CreateTest.h" \ "TestBase.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ AliveTest.obj: \ AliveTest.cpp \ @@ -89,7 +89,7 @@ AliveTest.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "AliveTest.h" \ "TestBase.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ StartTest.obj: \ StartTest.cpp \ @@ -120,7 +120,7 @@ StartTest.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "StartTest.h" \ "TestBase.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ RecMutexTest.obj: \ RecMutexTest.cpp \ @@ -151,7 +151,7 @@ RecMutexTest.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "RecMutexTest.h" \ "TestBase.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ MutexTest.obj: \ MutexTest.cpp \ @@ -182,7 +182,7 @@ MutexTest.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "MutexTest.h" \ "TestBase.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ MonitorMutexTest.obj: \ MonitorMutexTest.cpp \ @@ -213,7 +213,7 @@ MonitorMutexTest.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "MonitorMutexTest.h" \ "TestBase.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ MonitorRecMutexTest.obj: \ MonitorRecMutexTest.cpp \ @@ -244,7 +244,7 @@ MonitorRecMutexTest.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "MonitorRecMutexTest.h" \ "TestBase.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ CountDownLatchTest.obj: \ CountDownLatchTest.cpp \ @@ -275,7 +275,7 @@ CountDownLatchTest.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "CountDownLatchTest.h" \ "TestBase.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ TestSuite.obj: \ TestSuite.cpp \ @@ -321,6 +321,6 @@ Client.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\UUID.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "TestSuite.h" \ "TestBase.h" \ diff --git a/cpp/test/IceUtil/timer/.depend.mak b/cpp/test/IceUtil/timer/.depend.mak index 9e2d1de7180..0ca902dd2a2 100644 --- a/cpp/test/IceUtil/timer/.depend.mak +++ b/cpp/test/IceUtil/timer/.depend.mak @@ -14,7 +14,7 @@ Client.obj: \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/IceUtil/unicode/.depend.mak b/cpp/test/IceUtil/unicode/.depend.mak index 785ca8e42a2..f52b399cea6 100644 --- a/cpp/test/IceUtil/unicode/.depend.mak +++ b/cpp/test/IceUtil/unicode/.depend.mak @@ -26,4 +26,4 @@ Client.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\UUID.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/IceUtil/uuid/.depend.mak b/cpp/test/IceUtil/uuid/.depend.mak index 435661ff5c7..8b90a450b5d 100644 --- a/cpp/test/IceUtil/uuid/.depend.mak +++ b/cpp/test/IceUtil/uuid/.depend.mak @@ -14,7 +14,7 @@ Client.obj: \ "$(includedir)\IceUtil\ThreadException.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Slice/keyword/.depend.mak b/cpp/test/Slice/keyword/.depend.mak index d3c9cafcd83..e5b3ac37e08 100644 --- a/cpp/test/Slice/keyword/.depend.mak +++ b/cpp/test/Slice/keyword/.depend.mak @@ -192,7 +192,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Slice/macros/.depend.mak b/cpp/test/Slice/macros/.depend.mak index 83e18b12588..50f16914e27 100644 --- a/cpp/test/Slice/macros/.depend.mak +++ b/cpp/test/Slice/macros/.depend.mak @@ -191,7 +191,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ diff --git a/cpp/test/Slice/structure/.depend.mak b/cpp/test/Slice/structure/.depend.mak index fbda31e44cc..784a076cfba 100644 --- a/cpp/test/Slice/structure/.depend.mak +++ b/cpp/test/Slice/structure/.depend.mak @@ -256,7 +256,7 @@ Client.obj: \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\Service.h" \ - "..\..\include\TestCommon.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\AbstractMutex.h" \ "$(includedir)\IceUtil\Cache.h" \ |