http://bugzilla/bugzilla/show_bug.cgi?id=4384 - parallel build errors with src/Freeze.

3 files changed, 24 insertions, 9 deletions

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