More fixes for bug 3025 -- IceStorm Makefile bogus.

Cleanups to the UNIX & Windows Makefiles.
- SLICE2FREEZE now also depend on the associated slice library.
- Added several missing dependencies for freeze maps.
- Replace individual slice rule in IceStorm/Makefile.mak with an implicit rule.
- Makefile fixes to align Windows & UNIX Makefiles.

Squashed commit of the following:

commit c3dcd225c0083c9c38cc775459499287a86d9c15
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Tue Apr 29 18:31:22 2008 +0800

    - SLICE2FREEZE now also depend on the associated slice library.
    - Added several missing dependencies for freeze maps.

commit c42233aa5c6f2625fa07921dd25955b0cbe26607
Author: U-MARCH4\matthew <matthew@march4.(none)>
Date:   Tue Apr 29 02:39:55 2008 -0700

    Replace individual slice rules with an implicit rule.

commit d465395e76dc7c4feefd9fc088e11c6200dd3b21
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Tue Apr 29 16:10:39 2008 +0800

    Revert "more Makefile changes."

    This reverts commit 4921c746a981667298ab0ab5a66af1854a790994.

commit 3b5c6d520f74b60f8689fddaa40fdbe2652088e0
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Tue Apr 29 16:10:13 2008 +0800

    Revert "update dependencies."

    This reverts commit 9bc93dc0539ad26408b3da51d43ae60d6e982c89.

    ge for your changes.

commit 9bc93dc0539ad26408b3da51d43ae60d6e982c89
Author: matthew newhook <matthew@june.matthew.zeroc.com>
Date:   Tue Apr 29 09:23:34 2008 +0800

    update dependencies.

commit 4921c746a981667298ab0ab5a66af1854a790994
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Tue Apr 29 09:04:28 2008 +0800

    more Makefile changes.

commit 8826243e182077a867ca2085a0be7b6eca8ef8cf
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Tue Apr 29 08:44:58 2008 +0800

    Makefile fixes to align Windows & UNIX Makefiles.

24 files changed, 78 insertions, 85 deletions

diff --git a/cpp/demo/Freeze/backup/Makefile b/cpp/demo/Freeze/backup/Makefile
index 49d85503cc5..c48101346f6 100644
--- a/cpp/demo/Freeze/backup/Makefile
+++ b/cpp/demo/Freeze/backup/Makefile
@@ -27,7 +27,7 @@ $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS)
 
-IntLongMap.h IntLongMap.cpp: $(SLICE2FREEZE)
+IntLongMap.h IntLongMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB)
 	rm -f IntLongMap.h IntLongMap.cpp
 	$(SLICE2FREEZE) -I$(slicedir) --dict IntLongMap,int,long IntLongMap
 
diff --git a/cpp/demo/Freeze/backup/Makefile.mak b/cpp/demo/Freeze/backup/Makefile.mak
index 1de52f1c916..d2f8344cf2b 100755
--- a/cpp/demo/Freeze/backup/Makefile.mak
+++ b/cpp/demo/Freeze/backup/Makefile.mak
@@ -30,7 +30,7 @@ $(CLIENT): $(OBJS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

-IntLongMap.h IntLongMap.cpp: $(SLICE2FREEZE)

+IntLongMap.h IntLongMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q 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 00413c60d25..387c20746af 100644
--- a/cpp/demo/Freeze/bench/Makefile
+++ b/cpp/demo/Freeze/bench/Makefile
@@ -27,7 +27,7 @@ $(CLIENT): $(OBJS) $(COBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS)
 
-BenchTypes.h BenchTypes.cpp: Test.ice $(SLICE2FREEZE)
+BenchTypes.h 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/bench/Makefile.mak b/cpp/demo/Freeze/bench/Makefile.mak
index 88552c08943..12e2e21ec1d 100644
--- a/cpp/demo/Freeze/bench/Makefile.mak
+++ b/cpp/demo/Freeze/bench/Makefile.mak
@@ -30,7 +30,7 @@ $(CLIENT): $(OBJS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

-BenchTypes.h BenchTypes.cpp: Test.ice $(SLICE2FREEZE)

+BenchTypes.h BenchTypes.cpp: Test.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q 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 041edb4718a..edb532d50a3 100644
--- a/cpp/demo/Freeze/customEvictor/Makefile
+++ b/cpp/demo/Freeze/customEvictor/Makefile
@@ -45,7 +45,7 @@ $(SERVER): $(OBJS) $(SOBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS)
 
-Database.h Database.cpp: ItemInfo.ice $(SLICE2FREEZE)
+Database.h 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/customEvictor/Makefile.mak b/cpp/demo/Freeze/customEvictor/Makefile.mak
index 0fa18daacba..1c3d52ebc87 100755
--- a/cpp/demo/Freeze/customEvictor/Makefile.mak
+++ b/cpp/demo/Freeze/customEvictor/Makefile.mak
@@ -53,7 +53,7 @@ $(SERVER): $(OBJS) $(SOBJS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

-Database.h Database.cpp: ItemInfo.ice $(SLICE2FREEZE)

+Database.h Database.cpp: ItemInfo.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q 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 5c5221c0db2..bf2e042b287 100644
--- a/cpp/demo/Freeze/library/Makefile
+++ b/cpp/demo/Freeze/library/Makefile
@@ -61,7 +61,7 @@ $(COLLOCATED): $(OBJS) $(COLOBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(READLINE_LIBS)
 
-LibraryTypes.h LibraryTypes.cpp: Library.ice $(SLICE2FREEZE)
+LibraryTypes.h 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/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak
index c54b06505a7..4a36f512103 100644
--- a/cpp/demo/Freeze/library/Makefile.mak
+++ b/cpp/demo/Freeze/library/Makefile.mak
@@ -68,7 +68,7 @@ $(COLLOCATED): $(OBJS) $(COLOBJS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

-LibraryTypes.h LibraryTypes.cpp: Library.ice $(SLICE2FREEZE)

+LibraryTypes.h LibraryTypes.cpp: Library.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q 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 749c6e8f527..1d3071391eb 100644
--- a/cpp/demo/Freeze/phonebook/Makefile
+++ b/cpp/demo/Freeze/phonebook/Makefile
@@ -61,7 +61,7 @@ $(COLLOCATED): $(OBJS) $(COLOBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COLOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) $(READLINE_LIBS)
 
-NameIndex.h NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE)
+NameIndex.h 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/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak
index 80b6d8dd86a..fd32663cfaa 100644
--- a/cpp/demo/Freeze/phonebook/Makefile.mak
+++ b/cpp/demo/Freeze/phonebook/Makefile.mak
@@ -67,7 +67,7 @@ $(COLLOCATED): $(OBJS) $(COLOBJS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

-NameIndex.h NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE)

+NameIndex.h NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q 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 b6e8d0bbc80..a8db07b79be 100644
--- a/cpp/demo/Freeze/transform/Makefile
+++ b/cpp/demo/Freeze/transform/Makefile
@@ -48,13 +48,12 @@ $(RECREATE): $(RECREATE_OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $(RECREATE_OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS)
 
 
-Contacts.h Contacts.cpp: ContactData.ice $(SLICE2FREEZE)
+Contacts.h 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)
+NewContacts.h 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/demo/Freeze/transform/Makefile.mak b/cpp/demo/Freeze/transform/Makefile.mak
index a6100d5e7c5..1e41dd88feb 100755
--- a/cpp/demo/Freeze/transform/Makefile.mak
+++ b/cpp/demo/Freeze/transform/Makefile.mak
@@ -55,13 +55,12 @@ $(RECREATE): $(RECREATE_OBJS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

-Contacts.h Contacts.cpp: ContactData.ice $(SLICE2FREEZE)

+Contacts.h Contacts.cpp: ContactData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q 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)

+NewContacts.h NewContacts.cpp: NewContactData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q 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 a433bf0b777..827eebfe525 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -15,7 +15,6 @@ LIBNAME		= $(call mklibname,Freeze)
 
 TARGETS		= $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
 
-
 OBJS		= BackgroundSaveEvictor.o \
                   BackgroundSaveEvictorI.o \
                   CatalogData.o \
@@ -62,15 +61,13 @@ SLICE_SRCS	= $(SDIR)/BackgroundSaveEvictor.ice \
 HDIR		= $(headerdir)/Freeze
 SDIR		= $(slicedir)/Freeze
 
-
 include $(top_srcdir)/config/Make.rules
 
 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: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice
+$(HDIR)/Catalog.h 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
@@ -79,7 +76,7 @@ $(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice
 clean::
 	-rm -f $(HDIR)/Catalog.h Catalog.cpp
 
-$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(SLICE2FREEZE) $(slicedir)/Ice/BuiltinSequences.ice
+$(HDIR)/CatalogIndexList.h 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/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak
index 36064ee6749..525379f1b91 100644
--- a/cpp/src/Freeze/Makefile.mak
+++ b/cpp/src/Freeze/Makefile.mak
@@ -12,10 +12,8 @@ top_srcdir	= ..\..
 LIBNAME     	= $(top_srcdir)\lib\freeze$(LIBSUFFIX).lib

 DLLNAME		= $(top_srcdir)\bin\freeze$(SOVERSION)$(LIBSUFFIX).dll

 

-

 TARGETS		= $(LIBNAME) $(DLLNAME)

 

-

 OBJS		= BackgroundSaveEvictor.obj \

                   BackgroundSaveEvictorI.obj \

                   CatalogData.obj \

@@ -74,27 +72,27 @@ $(DLLNAME): $(OBJS) Freeze.res
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest

 	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)

 

-$(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice

+$(HDIR)/Catalog.h Catalog.cpp: $(SDIR)/CatalogData.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q $(HDIR)\Catalog.h Catalog.cpp

 	$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::Catalog,string,Freeze::CatalogData \

 	Catalog $(slicedir)/Freeze/CatalogData.ice

 	move Catalog.h $(HDIR)

+

 clean::

 	del /q $(HDIR)\Catalog.h Catalog.cpp

 

-

-$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(SLICE2FREEZE) $(slicedir)/Ice/BuiltinSequences.ice

+$(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp

 	$(SLICE2FREEZE) $(SLICE2CPPFLAGS) --dict Freeze::CatalogIndexList,string,Ice::StringSeq \

 	CatalogIndexList $(slicedir)/Ice/BuiltinSequences.ice

 	move CatalogIndexList.h $(HDIR)

 

-Freeze.res: Freeze.rc

-	rc.exe $(RCFLAGS) Freeze.rc

-

 clean::

 	del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp

 

+Freeze.res: Freeze.rc

+	rc.exe $(RCFLAGS) Freeze.rc

+

 clean::

 	del /q $(DLLNAME:.dll=.*)

 	del /q DB.cpp $(HDIR)\DB.h

diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index 57a1ec5556d..dee8f1c5d9b 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -92,6 +92,7 @@ SRCS		= $(ADMIN_OBJS:.o=.cpp) \
 SLICE_SRCS	= ../IceGrid/Internal.ice
 
 HDIR		= $(headerdir)/IceGrid
+SDIR		= $(slicedir)/IceGrid
 LOCAL_HDIR	= ../IceGrid
 LOCAL_SDIR	= ../IceGrid
 
@@ -99,9 +100,9 @@ SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS)
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= $(CPPFLAGS) -I.. -DICE_GRID_API_EXPORTS $(OPENSSL_FLAGS) $(READLINE_FLAGS)
+CPPFLAGS	:= $(CPPFLAGS) -I.. $(OPENSSL_FLAGS) $(READLINE_FLAGS)
 ICECPPFLAGS	:= $(ICECPPFLAGS) -I..
-SLICE2CPPFLAGS 	:= --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API $(SLICE2CPPFLAGS)
+SLICE2CPPFLAGS 	:= --checksum --ice --include-dir IceGrid $(SLICE2CPPFLAGS)
 LINKWITH        := -lGlacier2 $(BZIP2_RPATH_LINK) -lIce -lIceUtil
 
 $(ADMIN): $(ADMIN_OBJS) $(LIBTARGETS)
@@ -119,7 +120,7 @@ $(NODE_SERVER): $(NODE_SVR_OBJS) $(LIBTARGETS)
 	$(CXX) $(LDFLAGS) -o $@ $(NODE_SVR_OBJS) -lIceGrid -lIceStormService -lIceBox -lGlacier2 -lIcePatch2 \
 	$(DB_RPATH_LINK) -lFreeze $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_LIBS) $(LIBS)
 
-$(LOCAL_HDIR)/StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE2FREEZE)
+$(LOCAL_HDIR)/StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(LOCAL_SDIR)/Internal.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
 	rm -f StringApplicationInfoDict.h StringApplicationInfoDict.cpp
 	$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \
 	StringApplicationInfoDict $(LOCAL_SDIR)/Internal.ice
@@ -127,7 +128,7 @@ $(LOCAL_HDIR)/StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE
 clean::
 	-rm -f StringApplicationInfoDict.h StringApplicationInfoDict.cpp
 
-$(LOCAL_HDIR)/IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZE)
+$(LOCAL_HDIR)/IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(slicedir)/Ice/Identity.ice $(LOCAL_SDIR)/Internal.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
 	rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
 	$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \
 	--dict-index IceGrid::IdentityObjectInfoDict,type \
@@ -136,10 +137,10 @@ $(LOCAL_HDIR)/IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZ
 clean::
 	rm -f IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
 
-$(LOCAL_HDIR)/StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SLICE2FREEZE)
+$(LOCAL_HDIR)/StringAdapterInfoDict.h 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 $(slicedir)/IceGrid/Admin.ice
+	--dict-index IceGrid::StringAdapterInfoDict,replicaGroupId StringAdapterInfoDict $(SDIR)/Admin.ice
 
 clean::
 	rm -f StringAdapterInfoDict.h StringAdapterInfoDict.cpp
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index 350741cdd2a..0da6279acf5 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -91,6 +91,8 @@ SRCS            = $(ADMIN_OBJS:.obj=.cpp) \
 

 HDIR		= $(headerdir)\IceGrid

 SDIR		= $(slicedir)\IceGrid

+LOCAL_HDIR	= ..\IceGrid

+LOCAL_SDIR	= ..\IceGrid

 

 SLICE2FREEZECMD = $(SLICE2FREEZE) --ice --include-dir IceGrid $(ICECPPFLAGS)

 

@@ -143,18 +145,18 @@ $(NODE_SERVER): $(NODE_SVR_OBJS) IceGridNode.res
 	@if exist $@.manifest \

 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

-StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE2FREEZE)

+StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(LOCAL_SDIR)\Internal.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp

 	$(SLICE2FREEZECMD) --dict IceGrid::StringApplicationInfoDict,string,IceGrid::ApplicationInfo \

-	StringApplicationInfoDict Internal.ice

+	StringApplicationInfoDict $(LOCAL_SDIR)\Internal.ice

 

-IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(SLICE2FREEZE)

+IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp: $(slicedir)\Ice\Identity.ice $(LOCAL_SDIR)\Internal.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp

 	$(SLICE2FREEZECMD) --dict IceGrid::IdentityObjectInfoDict,Ice::Identity,IceGrid::ObjectInfo \

 	--dict-index IceGrid::IdentityObjectInfoDict,type \

-	IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice Internal.ice

+	IdentityObjectInfoDict $(slicedir)\Ice\Identity.ice $(LOCAL_SDIR)\Internal.ice

 

-StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SLICE2FREEZE)

+StringAdapterInfoDict.h StringAdapterInfoDict.cpp: $(SDIR)\Admin.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q 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/Makefile b/cpp/src/IceStorm/Makefile
index f9caf5edd31..91302e95176 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -85,7 +85,7 @@ include $(top_srcdir)/config/Make.rules
 
 CPPFLAGS	:= $(CPPFLAGS) -I.. $(READLINE_FLAGS) 
 ICECPPFLAGS	:= $(ICECPPFLAGS) -I..
-SLICE2CPPFLAGS	:= --checksum --ice --dll-export ICE_STORM_API --include-dir IceStorm $(SLICE2CPPFLAGS)
+SLICE2CPPFLAGS	:= --ice --include-dir IceStorm $(SLICE2CPPFLAGS)
 LINKWITH	:= $(BZIP2_RPATH_LINK) -lIce -lIceUtil
 SVCLINKWITH	:= $(DB_RPATH_LINK) -lIceGrid -lGlacier2 -lFreeze -lIceBox $(BZIP2_RPATH_LINK) -lIce -lIceUtil
 
@@ -121,28 +121,33 @@ $(MIGRATE): $(MOBJS) $(LIBTARGETS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(MOBJS) $(DB_RPATH_LINK) -lIceStorm -lFreeze $(LIBS)
 
-LLUMap.h LLUMap.cpp: $(SLICE2FREEZE) ../IceStorm/Election.ice
+LLUMap.h LLUMap.cpp: ../IceStorm/Election.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
 	rm -f LLUMap.h LLUMap.cpp
 	$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate \
 	LLUMap ../IceStorm/Election.ice
 
-SubscriberMap.h SubscriberMap.cpp: ../IceStorm/SubscriberRecord.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE)
+SubscriberMap.h 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.
-V32FormatDB.h V32FormatDB.cpp: ../IceStorm/V32Format.ice $(SLICE2FREEZE)
+V32FormatDB.h V32FormatDB.cpp: ../IceStorm/V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
 	rm -f V32FormatDB.h V32FormatDB.cpp
 	$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \
 	V32FormatDB ../IceStorm/V32Format.ice
 
-V31FormatDB.h V31FormatDB.cpp: ../IceStorm/V31Format.ice $(SLICE2FREEZE)
+V31FormatDB.h V31FormatDB.cpp: ../IceStorm/V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
 	rm -f V31FormatDB.h V31FormatDB.cpp
 	$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \
 	V31FormatDB ../IceStorm/V31Format.ice
 
+IceStorm.cpp $(HDIR)/IceStorm.h: $(SDIR)/IceStorm.ice $(SLICE2CPP) $(SLICEPARSERLIB)
+	rm -f IceStorm.cpp $(HDIR)/IceStorm.h
+	$(SLICE2CPP) --checksum --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) $(SDIR)/IceStorm.ice
+	mv IceStorm.h $(HDIR)
+
 # Needed for make -jn to work.
 ../IceStorm/Grammar.y: Grammar.h
 
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index 81cd57b80d3..c6baf07b4df 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -69,7 +69,8 @@ SDIR		= $(slicedir)\IceStorm
 !include $(top_srcdir)\config\Make.rules.mak

 

 CPPFLAGS	= -I.. -Idummyinclude $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN

-SLICE2CPPFLAGS	= --ice --include-dir IceStorm $(SLICE2CPPFLAGS) -I..

+ICECPPFLAGS	= $(ICECPPFLAGS) -I..

+SLICE2CPPFLAGS	= --ice --include-dir IceStorm $(SLICE2CPPFLAGS)

 LINKWITH 	= $(LIBS) icestorm$(LIBSUFFIX).lib icegrid$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib icebox$(LIBSUFFIX).lib

 ALINKWITH 	= $(LIBS) icestorm$(LIBSUFFIX).lib

 MLINKWITH 	= $(LIBS) icestorm$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib

@@ -123,47 +124,38 @@ $(MIGRATE): $(MOBJS) IceStormMigrate.res
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

-LLUMap.h LLUMap.cpp: $(SLICE2FREEZE) ..\IceStorm\Election.ice

+LLUMap.h LLUMap.cpp: ..\IceStorm\Election.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q LLUMap.h LLUMap.cpp

 	$(SLICE2FREEZECMD) --dict IceStorm::LLUMap,string,IceStormElection::LogUpdate LLUMap ..\IceStorm\Election.ice

 

-..\IceStorm\SubscriberMap.h SubscriberMap.cpp: ..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE)

+..\IceStorm\SubscriberMap.h SubscriberMap.cpp: ..\IceStorm\SubscriberRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q SubscriberMap.h SubscriberMap.cpp

 	$(SLICE2FREEZECMD) \

 	--dict IceStorm::SubscriberMap,IceStorm::SubscriberRecordKey,IceStorm::SubscriberRecord,sort \

 	SubscriberMap ..\IceStorm\SubscriberRecord.ice

 

 # Needed for migration.

-V32FormatDB.h V32FormatDB.cpp: ..\IceStorm\V32Format.ice $(SLICE2FREEZE)

+V32FormatDB.h V32FormatDB.cpp: ..\IceStorm\V32Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q V32FormatDB.h V32FormatDB.cpp

 	$(SLICE2FREEZECMD) --dict IceStorm::V32Format,Ice::Identity,IceStorm::LinkRecordSeq \

 	V32FormatDB ..\IceStorm\V32Format.ice

 

-V31FormatDB.h V31FormatDB.cpp: ..\IceStorm\V31Format.ice $(SLICE2FREEZE)

+V31FormatDB.h V31FormatDB.cpp: ..\IceStorm\V31Format.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q V31FormatDB.h V31FormatDB.cpp

 	$(SLICE2FREEZECMD) --dict IceStorm::V31Format,string,IceStorm::LinkRecordDict \

 	V31FormatDB ..\IceStorm\V31Format.ice

 

-V32Migrate.cpp ..\IceStorm\V32Migrate.h: ..\IceStorm\V32Migrate.ice

-	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V32Migrate.ice

-

-V31Migrate.cpp ..\IceStorm\V31Migrate.h: ..\IceStorm\V31Migrate.ice

-	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\V31Migrate.ice

-

-LinkRecord.cpp ..\IceStorm\LinkRecord.h: ..\IceStorm\LinkRecord.ice

-	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\LinkRecord.ice

-

-SubscriberRecord.cpp ..\IceStorm\SubscriberRecord.h: ..\IceStorm\SubscriberRecord.ice

-	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\SubscriberRecord.ice

-

-IceStorm.cpp $(HDIR)\IceStorm.h: $(SDIR)\IceStorm.ice

-	$(SLICE2CPP) --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) $(SDIR)\IceStorm.ice

+IceStorm.cpp $(HDIR)\IceStorm.h: $(SDIR)\IceStorm.ice $(SLICE2CPP) $(SLICEPARSERLIB)

+	del /q $(HDIR)\IceStorm.h IceStorm.cpp

+	$(SLICE2CPP) --checksum --dll-export ICE_STORM_LIB_API $(SLICE2CPPFLAGS) $(SDIR)\IceStorm.ice

 	move IceStorm.h $(HDIR)

 

-Election.cpp ..\IceStorm\Election.h: ..\IceStorm\Election.ice

-	$(SLICE2CPP) $(SLICE2CPPFLAGS) ..\IceStorm\Election.ice

+# Implicit rule to build the private IceStorm .ice files.

+{..\IceStorm\}.ice{..\IceStorm\}.h:

+	del /q $(*F).h $(*F).cpp

+	$(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice

 

-Scanner.cpp : Scanner.l

+Scanner.cpp: Scanner.l

 	flex Scanner.l

 	del /q $@

 	echo #include "IceUtil/Config.h" > Scanner.cpp

diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile
index 7ea015aba21..8dfd662b5b7 100644
--- a/cpp/test/Freeze/complex/Makefile
+++ b/cpp/test/Freeze/complex/Makefile
@@ -32,7 +32,7 @@ $(CLIENT): $(OBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS)
 
-ComplexDict.h ComplexDict.cpp: Complex.ice $(SLICE2FREEZE)
+ComplexDict.h 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/complex/Makefile.mak b/cpp/test/Freeze/complex/Makefile.mak
index dc05612e9dc..c1a43aea508 100644
--- a/cpp/test/Freeze/complex/Makefile.mak
+++ b/cpp/test/Freeze/complex/Makefile.mak
@@ -35,7 +35,7 @@ $(CLIENT): $(OBJS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

-ComplexDict.h ComplexDict.cpp: Complex.ice $(SLICE2FREEZE)

+ComplexDict.h ComplexDict.cpp: Complex.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q 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 c64b7f40bdf..69ba3066372 100644
--- a/cpp/test/Freeze/dbmap/Makefile
+++ b/cpp/test/Freeze/dbmap/Makefile
@@ -32,23 +32,23 @@ $(CLIENT): $(OBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS)
 
-ByteIntMap.h ByteIntMap.cpp: $(SLICE2FREEZE)
+ByteIntMap.h 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: $(SLICE2FREEZE)
+IntIdentityMap.h 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: $(SLICE2FREEZE)
+IntIdentityMapWithIndex.h 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: $(SLICE2FREEZE)
+SortedMap.h 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)
+WstringWstringMap.h 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/Freeze/dbmap/Makefile.mak b/cpp/test/Freeze/dbmap/Makefile.mak
index f7a29bf56ae..94195c4cc13 100644
--- a/cpp/test/Freeze/dbmap/Makefile.mak
+++ b/cpp/test/Freeze/dbmap/Makefile.mak
@@ -35,31 +35,31 @@ $(CLIENT): $(OBJS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

-ByteIntMap.h ByteIntMap.cpp: $(SLICE2FREEZE)

+ByteIntMap.h ByteIntMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q ByteIntMap.h ByteIntMap.cpp

 	$(SLICE2FREEZE) --dict Test::ByteIntMap,byte,int --dict-index Test::ByteIntMap,sort ByteIntMap

 

-IntIdentityMap.h IntIdentityMap.cpp: $(SLICE2FREEZE)

+IntIdentityMap.h IntIdentityMap.cpp: $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q IntIdentityMap.h IntIdentityMap.cpp

 	$(SLICE2FREEZE) --ice $(SLICE2CPPFLAGS)  --dict Test::IntIdentityMap,int,Ice::Identity IntIdentityMap $(slicedir)\Ice\Identity.ice

 

-IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp: $(SLICE2FREEZE)

+IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp: $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q 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: $(SLICE2FREEZE)

+SortedMap.h SortedMap.cpp: $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q 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)

+WstringWstringMap.h WstringWstringMap.cpp: $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q WstringWstringMap.h WstringWstringMap.cpp

 	$(SLICE2FREEZE) --dict Test::WstringWstringMap,[\"cpp:type:wstring\"]string,[\"cpp:type:wstring\"]string --dict-index Test::WstringWstringMap WstringWstringMap

 

 clean::

-

-clean::

-	del /q ByteIntMap.h ByteIntMap.cpp IntIdentityMap.h IntIdentityMap.cpp

-	del /q IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp SortedMap.h SortedMap.cpp

+	del /q ByteIntMap.h ByteIntMap.cpp

+        del /q IntIdentityMap.h IntIdentityMap.cpp

+	del /q IntIdentityMapWithIndex.h IntIdentityMapWithIndex.cpp

+        del /q SortedMap.h SortedMap.cpp

 	del /q WstringWstringMap.h WstringWstringMap.cpp

 	for %f in (db\*) do if not %f == db\.gitignore del /q %f

 

diff --git a/cpp/test/FreezeScript/dbmap/Makefile b/cpp/test/FreezeScript/dbmap/Makefile
index c267d2de3e8..e640369634a 100644
--- a/cpp/test/FreezeScript/dbmap/Makefile
+++ b/cpp/test/FreezeScript/dbmap/Makefile
@@ -29,7 +29,7 @@ $(CLIENT): $(OBJS)
 	rm -f $@
 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS)
 
-IntSMap.h IntSMap.cpp: $(SLICE2FREEZE)
+IntSMap.h IntSMap.cpp: TestOld.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)
 	rm -f IntSMap.h IntSMap.cpp
 	$(SLICE2FREEZE) --dict IntSMap,int,::Test::S IntSMap TestOld.ice
 
diff --git a/cpp/test/FreezeScript/dbmap/Makefile.mak b/cpp/test/FreezeScript/dbmap/Makefile.mak
index 926cd18b4c8..458d7478da6 100644
--- a/cpp/test/FreezeScript/dbmap/Makefile.mak
+++ b/cpp/test/FreezeScript/dbmap/Makefile.mak
@@ -34,7 +34,7 @@ $(CLIENT): $(OBJS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \

 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest

 

-IntSMap.h IntSMap.cpp: $(SLICE2FREEZE)

+IntSMap.h IntSMap.cpp: TestOld.ice $(SLICE2FREEZE) $(SLICEPARSERLIB)

 	del /q IntSMap.h IntSMap.cpp

 	$(SLICE2FREEZE) --dict IntSMap,int,::Test::S IntSMap TestOld.ice