summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Ice/Makefile.mak6
-rwxr-xr-xcpp/test/Ice/custom/.depend.mak13
-rwxr-xr-xcpp/test/Ice/echo/.depend.mak3
-rwxr-xr-xcpp/test/Ice/gc/.depend.mak2
-rw-r--r--cpp/test/Ice/impl/Makefile8
-rw-r--r--cpp/test/Ice/impl/Makefile.mak4
-rwxr-xr-xcpp/test/Ice/optional/.depend.mak8
-rwxr-xr-xcpp/test/Ice/stream/.depend.mak2
8 files changed, 38 insertions, 8 deletions
diff --git a/cpp/test/Ice/Makefile.mak b/cpp/test/Ice/Makefile.mak
index 57db49934a1..42cb190dc10 100644
--- a/cpp/test/Ice/Makefile.mak
+++ b/cpp/test/Ice/Makefile.mak
@@ -48,7 +48,8 @@ SUBDIRS = proxy \
enums \
logger \
networkProxy \
- services
+ services \
+ impl
!else
SUBDIRS = proxy \
operations \
@@ -102,7 +103,8 @@ SUBDIRS = $(SUBDIRS) \
checksum \
defaultServant \
interceptor \
- services
+ services \
+ impl
!endif
!endif
diff --git a/cpp/test/Ice/custom/.depend.mak b/cpp/test/Ice/custom/.depend.mak
index 303525095df..5422aff9c58 100755
--- a/cpp/test/Ice/custom/.depend.mak
+++ b/cpp/test/Ice/custom/.depend.mak
@@ -76,6 +76,7 @@ Test.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -208,6 +209,7 @@ Wstring.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -299,6 +301,7 @@ Client.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
@@ -436,6 +439,7 @@ AllTests.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
@@ -580,6 +584,7 @@ TestI.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -713,6 +718,7 @@ WstringI.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -799,6 +805,7 @@ Server.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
@@ -930,6 +937,7 @@ TestAMD.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -1062,6 +1070,7 @@ TestAMDI.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -1194,6 +1203,7 @@ WstringAMD.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -1278,6 +1288,7 @@ WstringAMDI.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -1365,6 +1376,7 @@ ServerAMD.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
@@ -1505,6 +1517,7 @@ Collocated.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
diff --git a/cpp/test/Ice/echo/.depend.mak b/cpp/test/Ice/echo/.depend.mak
index 5f6544ab546..3286616755e 100755
--- a/cpp/test/Ice/echo/.depend.mak
+++ b/cpp/test/Ice/echo/.depend.mak
@@ -67,6 +67,7 @@ Test.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -158,6 +159,7 @@ BlobjectI.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
@@ -285,6 +287,7 @@ Server.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
diff --git a/cpp/test/Ice/gc/.depend.mak b/cpp/test/Ice/gc/.depend.mak
index a27b7e4c092..44115b67deb 100755
--- a/cpp/test/Ice/gc/.depend.mak
+++ b/cpp/test/Ice/gc/.depend.mak
@@ -67,6 +67,7 @@ Test.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -160,6 +161,7 @@ Client.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
diff --git a/cpp/test/Ice/impl/Makefile b/cpp/test/Ice/impl/Makefile
index 27378a5fdbc..88f471d69fa 100644
--- a/cpp/test/Ice/impl/Makefile
+++ b/cpp/test/Ice/impl/Makefile
@@ -40,18 +40,18 @@ endif
Test.cpp: Test.ice $(SLICE2CPP)
rm -f $(*F).h $(*F).cpp $(*F)I.h $(*F)I.cpp
$(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice
- @touch $(*F).cpp $(*F)I.cpp
+ @touch $(*F).cpp
Test.h TestI.cpp TestI.h: Test.cpp
- @touch Test.h TestI.cpp TestI.h
+ @touch TestI.cpp
TestAMD.cpp: TestAMD.ice $(SLICE2CPP)
rm -f $(*F).h $(*F).cpp $(*F)I.h $(*F)I.cpp
$(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice
- @touch $(*F).cpp $(*F)I.cpp
+ @touch $(*F).cpp
TestAMD.h TestAMDI.cpp TestAMDI.h: TestAMD.cpp
- @touch TestAMD.h TestAMDI.cpp TestAMDI.h
+ @touch TestAMDI.cpp
$(SERVER): $(SOBJS)
rm -f $@
diff --git a/cpp/test/Ice/impl/Makefile.mak b/cpp/test/Ice/impl/Makefile.mak
index d91de148913..f2df2e2d641 100644
--- a/cpp/test/Ice/impl/Makefile.mak
+++ b/cpp/test/Ice/impl/Makefile.mak
@@ -55,11 +55,11 @@ SLICE2CPPFLAGS = --impl-c++98 $(SLICE2CPPFLAGS)
Test.cpp Test.h:
del /q (*F).h $(*F).cpp (*F)I.h $(*F)I.cpp
- "$(SLICE2CPP)" $(SLICE2CPPFLAGS) $<
+ "$(SLICE2CPP)" $(SLICE2CPPFLAGS) Test.ice
TestAMD.cpp TestAMD.h:
del /q (*F).h $(*F).cpp (*F)I.h $(*F)I.cpp
- "$(SLICE2CPP)" $(SLICE2CPPFLAGS) $<
+ "$(SLICE2CPP)" $(SLICE2CPPFLAGS) TestAMD.ice
$(SERVER)$(EXT): $(SOBJS)
$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
diff --git a/cpp/test/Ice/optional/.depend.mak b/cpp/test/Ice/optional/.depend.mak
index 45116743e89..fad1f15b734 100755
--- a/cpp/test/Ice/optional/.depend.mak
+++ b/cpp/test/Ice/optional/.depend.mak
@@ -70,6 +70,7 @@ Test.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -209,6 +210,7 @@ TestI.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
@@ -339,6 +341,7 @@ Client.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
@@ -474,6 +477,7 @@ AllTests.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
@@ -608,6 +612,7 @@ Server.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
@@ -734,6 +739,7 @@ TestAMD.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -873,6 +879,7 @@ TestAMDI.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
@@ -1003,6 +1010,7 @@ ServerAMD.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \
diff --git a/cpp/test/Ice/stream/.depend.mak b/cpp/test/Ice/stream/.depend.mak
index c7b7d9f3482..d6d6fca35c5 100755
--- a/cpp/test/Ice/stream/.depend.mak
+++ b/cpp/test/Ice/stream/.depend.mak
@@ -68,6 +68,7 @@ Test.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\BuiltinSequences.h" \
"$(includedir)\Ice\GCObject.h" \
@@ -160,6 +161,7 @@ Client.obj: \
"$(includedir)\Ice\SlicedDataF.h" \
"$(includedir)\Ice\UserExceptionFactory.h" \
"$(includedir)\Ice\FactoryTable.h" \
+ "$(includedir)\Ice\VirtualShared.h" \
"$(includedir)\Ice\LocalException.h" \
"$(includedir)\Ice\InstrumentationF.h" \
"$(includedir)\Ice\Dispatcher.h" \