diff options
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Freeze/complex/Makefile | 5 | ||||
| -rw-r--r-- | cpp/test/Freeze/dbmap/Makefile | 17 | ||||
| -rw-r--r-- | cpp/test/FreezeScript/dbmap/Makefile | 5 |
3 files changed, 20 insertions, 7 deletions
diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile index fbe145612a2..0f6a4e7c95f 100644 --- a/cpp/test/Freeze/complex/Makefile +++ b/cpp/test/Freeze/complex/Makefile @@ -32,7 +32,10 @@ $(CLIENT): $(OBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) -ComplexDict.h ComplexDict.cpp: Complex.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) +# The slice2freeze rules are structured like this to avoid issues with +# parallel make. +ComplexDict.h: ComplexDict.cpp +ComplexDict.cpp: Complex.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) rm -f ComplexDict.h ComplexDict.cpp $(SLICE2FREEZE) -I$(slicedir) --dict Complex::ComplexDict,Complex::Key,Complex::Node ComplexDict Complex.ice diff --git a/cpp/test/Freeze/dbmap/Makefile b/cpp/test/Freeze/dbmap/Makefile index fe5091cceea..2e02300a1c3 100644 --- a/cpp/test/Freeze/dbmap/Makefile +++ b/cpp/test/Freeze/dbmap/Makefile @@ -32,23 +32,30 @@ $(CLIENT): $(OBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) -ByteIntMap.h ByteIntMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB) +# The slice2freeze rules are structured like this to avoid issues with +# parallel make. +ByteIntMap.h: ByteIntMap.cpp +ByteIntMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB) rm -f ByteIntMap.h ByteIntMap.cpp $(SLICE2FREEZE) --dict Test::ByteIntMap,byte,int --dict-index "Test::ByteIntMap,sort" ByteIntMap -IntIdentityMap.h IntIdentityMap.cpp: $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) +IntIdentityMap.h: IntIdentityMap.cpp +IntIdentityMap.cpp: $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) rm -f IntIdentityMap.h IntIdentityMap.cpp $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMap,int,Ice::Identity IntIdentityMap $(slicedir)/Ice/Identity.ice -IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp: $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) +IntIdentityMapWithIndex.h: IntIdentityMapWithIndex.cpp +IntIdentityMapWithIndex.cpp: $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) rm -f IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::IntIdentityMapWithIndex,int,Ice::Identity --dict-index Test::IntIdentityMapWithIndex,category IntIdentityMapWithIndex $(slicedir)/Ice/Identity.ice -SortedMap.h SortedMap.cpp: $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) +SortedMap.h: SortedMap.cpp +SortedMap.cpp: $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) rm -f SortedMap.h SortedMap.cpp $(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS) --dict Test::SortedMap,int,Ice::Identity,sort SortedMap --dict-index "Test::SortedMap,category,sort,std::greater<std::string>" $(slicedir)/Ice/Identity.ice -WstringWstringMap.h WstringWstringMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB) +WstringWstringMap.h: WstringWstringMap.cpp +WstringWstringMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB) rm -f WstringWstringMap.h WstringWstringMap.cpp $(SLICE2FREEZE) --dict 'Test::WstringWstringMap,["cpp:type:wstring"]string,["cpp:type:wstring"]string' --dict-index Test::WstringWstringMap WstringWstringMap diff --git a/cpp/test/FreezeScript/dbmap/Makefile b/cpp/test/FreezeScript/dbmap/Makefile index 370f36574cb..6132cb851ff 100644 --- a/cpp/test/FreezeScript/dbmap/Makefile +++ b/cpp/test/FreezeScript/dbmap/Makefile @@ -29,7 +29,10 @@ $(CLIENT): $(OBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) -IntSMap.h IntSMap.cpp: TestOld.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) +# The slice2freeze rules are structured like this to avoid issues with +# parallel make. +IntSMap.h: IntSMap.cpp +IntSMap.cpp: TestOld.ice $(SLICE2FREEZE) $(SLICEPARSERLIB) rm -f IntSMap.h IntSMap.cpp $(SLICE2FREEZE) --dict IntSMap,int,::Test::S IntSMap TestOld.ice |