summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/Freeze/backup/Makefile5
-rw-r--r--cpp/demo/Freeze/bench/Makefile5
-rw-r--r--cpp/demo/Freeze/customEvictor/Makefile5
-rw-r--r--cpp/demo/Freeze/library/Makefile5
-rw-r--r--cpp/demo/Freeze/phonebook/Makefile5
-rw-r--r--cpp/demo/Freeze/transform/Makefile8
-rw-r--r--cpp/src/Freeze/Makefile8
-rw-r--r--cpp/src/IceGrid/FreezeDB/Makefile11
-rw-r--r--cpp/src/IceStorm/FreezeDB/Makefile14
-rw-r--r--cpp/test/Freeze/complex/Makefile5
-rw-r--r--cpp/test/Freeze/dbmap/Makefile17
-rw-r--r--cpp/test/FreezeScript/dbmap/Makefile5
12 files changed, 70 insertions, 23 deletions
diff --git a/cpp/demo/Freeze/backup/Makefile b/cpp/demo/Freeze/backup/Makefile
index 70cd610cc6d..e9e86c97a62 100644
--- a/cpp/demo/Freeze/backup/Makefile
+++ b/cpp/demo/Freeze/backup/Makefile
@@ -27,7 +27,10 @@ $(CLIENT): $(OBJS) $(COBJS)
rm -f $@
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS)
-IntLongMap.h IntLongMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB)
+# The slice2freeze rules are structured like this to avoid issues with
+# parallel make.
+IntLongMap.h: IntLongMap.cpp
+IntLongMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f IntLongMap.h IntLongMap.cpp
$(SLICE2FREEZE) -I$(slicedir) --dict IntLongMap,int,long IntLongMap
diff --git a/cpp/demo/Freeze/bench/Makefile b/cpp/demo/Freeze/bench/Makefile
index a8ed969a123..3ee48516a98 100644
--- a/cpp/demo/Freeze/bench/Makefile
+++ b/cpp/demo/Freeze/bench/Makefile
@@ -27,7 +27,10 @@ $(CLIENT): $(OBJS) $(COBJS)
rm -f $@
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS)
-BenchTypes.h BenchTypes.cpp: Test.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+# The slice2freeze rules are structured like this to avoid issues with
+# parallel make.
+BenchTypes.h: BenchTypes.cpp
+BenchTypes.cpp: Test.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f BenchTypes.h BenchTypes.cpp
$(SLICE2FREEZE) -I$(slicedir) --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2 \
--dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1 \
diff --git a/cpp/demo/Freeze/customEvictor/Makefile b/cpp/demo/Freeze/customEvictor/Makefile
index 5d7e7caa33c..51225ecec3d 100644
--- a/cpp/demo/Freeze/customEvictor/Makefile
+++ b/cpp/demo/Freeze/customEvictor/Makefile
@@ -45,7 +45,10 @@ $(SERVER): $(OBJS) $(SOBJS)
rm -f $@
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS)
-Database.h Database.cpp: ItemInfo.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+# The slice2freeze rules are structured like this to avoid issues with
+# parallel make.
+Database.h: Database.cpp
+Database.cpp: ItemInfo.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f Database.h Database.cpp
$(SLICE2FREEZE) -I$(slicedir) --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
diff --git a/cpp/demo/Freeze/library/Makefile b/cpp/demo/Freeze/library/Makefile
index 2e7fc5deb22..20b0e9789fe 100644
--- a/cpp/demo/Freeze/library/Makefile
+++ b/cpp/demo/Freeze/library/Makefile
@@ -61,7 +61,10 @@ $(COLLOCATED): $(OBJS) $(COLOBJS)
rm -f $@
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(READLINE_LIBS)
-LibraryTypes.h LibraryTypes.cpp: Library.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+# The slice2freeze rules are structured like this to avoid issues with
+# parallel make.
+LibraryTypes.h: LibraryTypes.cpp
+LibraryTypes.cpp: Library.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f LibraryTypes.h LibraryTypes.cpp
$(SLICE2FREEZE) --ice -I$(slicedir) --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes $(slicedir)/Ice/BuiltinSequences.ice Library.ice
diff --git a/cpp/demo/Freeze/phonebook/Makefile b/cpp/demo/Freeze/phonebook/Makefile
index 89993a02c82..248bb49bcb4 100644
--- a/cpp/demo/Freeze/phonebook/Makefile
+++ b/cpp/demo/Freeze/phonebook/Makefile
@@ -61,7 +61,10 @@ $(COLLOCATED): $(OBJS) $(COLOBJS)
rm -f $@
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(READLINE_LIBS)
-NameIndex.h NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+# The slice2freeze rules are structured like this to avoid issues with
+# parallel make.
+NameIndex.h: NameIndex.cpp
+NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f NameIndex.h NameIndex.cpp
$(SLICE2FREEZE) $(ICECPPFLAGS) --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
diff --git a/cpp/demo/Freeze/transform/Makefile b/cpp/demo/Freeze/transform/Makefile
index 9178a16a2f0..053c13fb4a1 100644
--- a/cpp/demo/Freeze/transform/Makefile
+++ b/cpp/demo/Freeze/transform/Makefile
@@ -48,12 +48,16 @@ $(RECREATE): $(RECREATE_OBJS)
$(CXX) $(LDFLAGS) -o $@ $(RECREATE_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS)
-Contacts.h Contacts.cpp: ContactData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+# The slice2freeze rules are structured like this to avoid issues with
+# parallel make.
+Contacts.h: Contacts.cpp
+Contacts.cpp: ContactData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f Contacts.h Contacts.cpp
$(SLICE2FREEZE) -I$(slicedir) --dict Demo::Contacts,string,Demo::ContactData,sort \
--dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
-NewContacts.h NewContacts.cpp: NewContactData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+NewContacts.h: NewContacts.cpp
+NewContacts.cpp: NewContactData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f NewContacts.h NewContacts.cpp
$(SLICE2FREEZE) -I$(slicedir) --dict Demo::NewContacts,string,Demo::ContactData,sort \
--dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index 5595058c658..b9bc7315c5d 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -67,7 +67,10 @@ CPPFLAGS := -I.. $(CPPFLAGS) -DFREEZE_API_EXPORTS $(DB_FLAGS)
SLICE2CPPFLAGS := --ice --include-dir Freeze --dll-export FREEZE_API $(SLICE2CPPFLAGS)
LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(DB_LIBS)
-$(HDIR)/Catalog.h Catalog.cpp: $(SDIR)/CatalogData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+# The slice2freeze rules are structured like this to avoid issues with
+# parallel make.
+$(HDIR)/Catalog.h: Catalog.cpp
+Catalog.cpp: $(SDIR)/CatalogData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f $(HDIR)/Catalog.h Catalog.cpp
$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::Catalog,string,Freeze::CatalogData \
Catalog $(slicedir)/Freeze/CatalogData.ice
@@ -76,7 +79,8 @@ $(HDIR)/Catalog.h Catalog.cpp: $(SDIR)/CatalogData.ice $(SLICE2FREEZE) $(SLICEPA
clean::
-rm -f $(HDIR)/Catalog.h Catalog.cpp
-$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+$(HDIR)/CatalogIndexList.h: CatalogIndexList.cpp
+CatalogIndexList.cpp: $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f $(HDIR)/CatalogIndexList.h CatalogIndexList.cpp
$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \
CatalogIndexList ../../../slice/Ice/BuiltinSequences.ice
diff --git a/cpp/src/IceGrid/FreezeDB/Makefile b/cpp/src/IceGrid/FreezeDB/Makefile
index 42345275f45..7aab20f93b5 100644
--- a/cpp/src/IceGrid/FreezeDB/Makefile
+++ b/cpp/src/IceGrid/FreezeDB/Makefile
@@ -51,18 +51,23 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
ln -s $(SONAME) $@
-../../IceGrid/FreezeDB/StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SDIR)/Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+# The slice2freeze rules are structured like this to avoid issues with
+# parallel make.
+../../IceGrid/FreezeDB/StringApplicationInfoDict.h: StringApplicationInfoDict.cpp
+StringApplicationInfoDict.cpp: $(SDIR)/Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f StringApplicationInfoDict.h StringApplicationInfoDict.cpp
$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \
StringApplicationInfoDict $(SDIR)/Admin.ice
-../../IceGrid/FreezeDB/IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(slicedir)/Ice/Identity.ice $(SDIR)/Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+../../IceGrid/FreezeDB/IdentityObjectInfoDict.h: IdentityObjectInfoDict.cpp
+IdentityObjectInfoDict.cpp: $(slicedir)/Ice/Identity.ice $(SDIR)/Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \
--dict-index IceGrid::IdentityObjectInfoDict,type \
IdentityObjectInfoDict $(slicedir)/Ice/Identity.ice $(SDIR)/Admin.ice
-../../IceGrid/FreezeDB/StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SDIR)/Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+../../IceGrid/FreezeDB/StringAdapterInfoDict.h: StringAdapterInfoDict.cpp
+StringAdapterInfoDict.cpp: $(SDIR)/Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f StringAdapterInfoDict.h StringAdapterInfoDict.cpp
$(SLICE2FREEZECMD) --dict IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo \
--dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)/Admin.ice
diff --git a/cpp/src/IceStorm/FreezeDB/Makefile b/cpp/src/IceStorm/FreezeDB/Makefile
index eff6304e5f0..dccf5af2acb 100644
--- a/cpp/src/IceStorm/FreezeDB/Makefile
+++ b/cpp/src/IceStorm/FreezeDB/Makefile
@@ -68,24 +68,30 @@ $(MIGRATE): $(MOBJS)
rm -f $@
$(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStormService -lIceStorm -lFreeze $(LIBS)
-../../IceStorm/FreezeDB/LLUMap.h LLUMap.cpp: ../../IceStorm/LLURecord.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+# The slice2freeze rules are structured like this to avoid issues with
+# parallel make.
+../../IceStorm/FreezeDB/LLUMap.h: LLUMap.cpp
+LLUMap.cpp: ../../IceStorm/LLURecord.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f LLUMap.h LLUMap.cpp
$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate \
LLUMap ../../IceStorm/LLURecord.ice
-../../IceStorm/FreezeDB/SubscriberMap.h SubscriberMap.cpp: ../../IceStorm/SubscriberRecord.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+../../IceStorm/FreezeDB/SubscriberMap.h: SubscriberMap.cpp
+SubscriberMap.cpp: ../../IceStorm/SubscriberRecord.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f SubscriberMap.h SubscriberMap.cpp
$(SLICE2FREEZECMD) \
--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \
SubscriberMap ../../IceStorm/SubscriberRecord.ice
# Needed for migration.
-../../IceStorm/FreezeDB/V32FormatDB.h V32FormatDB.cpp: ../../IceStorm/FreezeDB/V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+../../IceStorm/FreezeDB/V32FormatDB.h: V32FormatDB.cpp
+V32FormatDB.cpp: ../../IceStorm/FreezeDB/V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f V32FormatDB.h V32FormatDB.cpp
$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \
V32FormatDB ../../IceStorm/FreezeDB/V32Format.ice
-../../IceStorm/FreezeDB/V31FormatDB.h V31FormatDB.cpp: ../../IceStorm/FreezeDB/V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
+../../IceStorm/FreezeDB/V31FormatDB.h: V31FormatDB.cpp
+V31FormatDB.cpp: ../../IceStorm/FreezeDB/V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
rm -f V31FormatDB.h V31FormatDB.cpp
$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \
V31FormatDB ../../IceStorm/FreezeDB/V31Format.ice
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
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 16:24:37 +0000