diff options
| -rw-r--r-- | cpp/config/Make.rules.mak | 29 | ||||
| -rw-r--r-- | cpp/src/Freeze/Makefile.mak | 35 | ||||
| -rw-r--r-- | cpp/src/FreezeScript/Makefile.mak | 10 | ||||
| -rw-r--r-- | cpp/src/Glacier2/Makefile.mak | 19 | ||||
| -rw-r--r-- | cpp/src/Ice/Makefile.mak | 71 | ||||
| -rw-r--r-- | cpp/src/IceBox/Makefile.mak | 19 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Makefile.mak | 24 | ||||
| -rw-r--r-- | cpp/src/IceGridLib/Makefile.mak | 23 | ||||
| -rw-r--r-- | cpp/src/IcePatch2/Makefile.mak | 13 | ||||
| -rw-r--r-- | cpp/src/IceSSL/Makefile.mak | 3 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile.mak | 39 | ||||
| -rw-r--r-- | cpp/src/IceUtil/Makefile.mak | 3 | ||||
| -rw-r--r-- | cpp/src/IceXML/Makefile.mak | 3 | ||||
| -rw-r--r-- | cpp/src/Slice/Makefile.mak | 7 |
14 files changed, 164 insertions, 134 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 116236a033c..f34defbf523 100644 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -207,6 +207,35 @@ clean:: !endif
+# Suffix set, we're using a debug build.
+!if "$(LIBSUFFIX)" != ""
+
+!if "$(LIBNAME)" != ""
+clean::
+ -del /q $(LIBNAME:d.lib=.lib)
+ -del /q $(LIBNAME)
+!endif
+!if "$(DLLNAME)" != ""
+clean::
+ -del /q $(DLLNAME:d.dll=.*)
+ -del /q $(DLLNAME:.dll=.*)
+!endif
+
+!else
+
+!if "$(LIBNAME)" != ""
+clean::
+ -del /q $(LIBNAME:.lib=d.lib)
+ -del /q $(LIBNAME)
+!endif
+!if "$(DLLNAME)" != ""
+clean::
+ -del /q $(DLLNAME:.dll=d.*)
+ -del /q $(DLLNAME:.dll=.*)
+!endif
+
+!endif
+
clean::
-del /q *.obj *.bak *.ilk *.exp *.pdb *.tds *.idb
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak index e8b5862909d..b0e550e6a6e 100644 --- a/cpp/src/Freeze/Makefile.mak +++ b/cpp/src/Freeze/Makefile.mak @@ -78,9 +78,6 @@ $(HDIR)/Catalog.h Catalog.cpp: $(SDIR)/CatalogData.ice $(SLICE2FREEZE) $(SLICEPA Catalog $(slicedir)/Freeze/CatalogData.ice
move Catalog.h $(HDIR)
-clean::
- del /q $(HDIR)\Catalog.h Catalog.cpp
-
$(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 \
@@ -88,23 +85,21 @@ $(HDIR)/CatalogIndexList.h CatalogIndexList.cpp: $(slicedir)/Ice/BuiltinSequence move CatalogIndexList.h $(HDIR)
clean::
- del /q $(HDIR)\CatalogIndexList.h CatalogIndexList.cpp
-
-clean::
- del /q $(DLLNAME:.dll=.*)
- del /q DB.cpp $(HDIR)\DB.h
- del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h
- del /q CatalogData.cpp $(HDIR)\CatalogData.h
- del /q Connection.cpp $(HDIR)\Connection.h
- del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
- del /q Exception.cpp $(HDIR)\Exception.h
- del /q EvictorF.cpp $(HDIR)\EvictorF.h
- del /q Evictor.cpp $(HDIR)\Evictor.h
- del /q EvictorStorage.cpp $(HDIR)\EvictorStorage.h
- del /q Transaction.cpp $(HDIR)\Transaction.h
- del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h
- del /q PingObject.cpp PingObject.h
- del /q Freeze.res
+ -del /q Catalog.cpp $(HDIR)\Catalog.h
+ -del /q CatalogIndexList.cpp $(HDIR)\CatalogIndexList.h
+ -del /q DB.cpp $(HDIR)\DB.h
+ -del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h
+ -del /q CatalogData.cpp $(HDIR)\CatalogData.h
+ -del /q Connection.cpp $(HDIR)\Connection.h
+ -del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
+ -del /q Exception.cpp $(HDIR)\Exception.h
+ -del /q EvictorF.cpp $(HDIR)\EvictorF.h
+ -del /q Evictor.cpp $(HDIR)\Evictor.h
+ -del /q EvictorStorage.cpp $(HDIR)\EvictorStorage.h
+ -del /q Transaction.cpp $(HDIR)\Transaction.h
+ -del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h
+ -del /q PingObject.cpp PingObject.h
+ -del /q Freeze.res
install:: all
copy $(LIBNAME) $(install_libdir)
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak index a58eb0b03c9..d4ab331e5e7 100644 --- a/cpp/src/FreezeScript/Makefile.mak +++ b/cpp/src/FreezeScript/Makefile.mak @@ -82,11 +82,11 @@ Grammar.cpp Grammar.h: Grammar.y del /q Grammar.output
clean::
- del /q $(TRANSFORMDB:.exe=.*)
- del /q $(DUMPDB:.exe=.*)
- del /q Grammar.cpp Grammar.h
- del /q Scanner.cpp
- del /q TransformDB.res DumpDB.res
+ -del /q $(TRANSFORMDB:.exe=.*)
+ -del /q $(DUMPDB:.exe=.*)
+ -del /q Grammar.cpp Grammar.h
+ -del /q Scanner.cpp
+ -del /q TransformDB.res DumpDB.res
install:: all
copy $(TRANSFORMDB) $(install_bindir)
diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak index f1fb5146154..88e8f517616 100644 --- a/cpp/src/Glacier2/Makefile.mak +++ b/cpp/src/Glacier2/Makefile.mak @@ -79,16 +79,15 @@ $(ROUTER): $(ROBJS) Glacier2Router.res $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
clean::
- del /q PermissionsVerifierF.cpp $(HDIR)\PermissionsVerifierF.h
- del /q PermissionsVerifier.cpp $(HDIR)\PermissionsVerifier.h
- del /q RouterF.cpp $(HDIR)\RouterF.h
- del /q Router.cpp $(HDIR)\Router.h
- del /q SessionF.cpp $(HDIR)\SessionF.h
- del /q Session.cpp $(HDIR)\Session.h
- del /q SSLInfo.cpp $(HDIR)\SSLInfo.h
- del /q Glacier2Router.res Glacier2.res
- del /q $(DLLNAME:.dll=.*)
- del /q $(ROUTER:.exe=.*)
+ -del /q PermissionsVerifierF.cpp $(HDIR)\PermissionsVerifierF.h
+ -del /q PermissionsVerifier.cpp $(HDIR)\PermissionsVerifier.h
+ -del /q RouterF.cpp $(HDIR)\RouterF.h
+ -del /q Router.cpp $(HDIR)\Router.h
+ -del /q SessionF.cpp $(HDIR)\SessionF.h
+ -del /q Session.cpp $(HDIR)\Session.h
+ -del /q SSLInfo.cpp $(HDIR)\SSLInfo.h
+ -del /q Glacier2Router.res Glacier2.res
+ -del /q $(ROUTER:.exe=.*)
install:: all
copy $(LIBNAME) $(install_libdir)
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 86800d9d74b..3424f3e2439 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -153,42 +153,41 @@ EventLoggerMsg.h EventLoggerMsg.rc: EventLoggerMsg.mc Ice.res: EventLoggerMsg.rc
clean::
- del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h
- del /q CommunicatorF.cpp $(HDIR)\CommunicatorF.h
- del /q Communicator.cpp $(HDIR)\Communicator.h
- del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
- del /q Connection.cpp $(HDIR)\Connection.h
- del /q Current.cpp $(HDIR)\Current.h
- del /q Endpoint.cpp $(HDIR)\Endpoint.h
- del /q FacetMap.cpp $(HDIR)\FacetMap.h
- del /q ImplicitContextF.cpp $(HDIR)\ImplicitContextF.h
- del /q ImplicitContext.cpp $(HDIR)\ImplicitContext.h
- del /q Identity.cpp $(HDIR)\Identity.h
- del /q LocalException.cpp $(HDIR)\LocalException.h
- del /q LocatorF.cpp $(HDIR)\LocatorF.h
- del /q Locator.cpp $(HDIR)\Locator.h
- del /q LoggerF.cpp $(HDIR)\LoggerF.h
- del /q Logger.cpp $(HDIR)\Logger.h
- del /q ObjectAdapterF.cpp $(HDIR)\ObjectAdapterF.h
- del /q ObjectAdapter.cpp $(HDIR)\ObjectAdapter.h
- del /q ObjectFactoryF.cpp $(HDIR)\ObjectFactoryF.h
- del /q ObjectFactory.cpp $(HDIR)\ObjectFactory.h
- del /q PluginF.cpp $(HDIR)\PluginF.h
- del /q Plugin.cpp $(HDIR)\Plugin.h
- del /q ProcessF.cpp $(HDIR)\ProcessF.h
- del /q Process.cpp $(HDIR)\Process.h
- del /q PropertiesF.cpp $(HDIR)\PropertiesF.h
- del /q Properties.cpp $(HDIR)\Properties.h
- del /q RouterF.cpp $(HDIR)\RouterF.h
- del /q Router.cpp $(HDIR)\Router.h
- del /q ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h
- del /q ServantLocator.cpp $(HDIR)\ServantLocator.h
- del /q SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h
- del /q StatsF.cpp $(HDIR)\StatsF.h
- del /q Stats.cpp $(HDIR)\Stats.h
- del /q $(DLLNAME:.dll=.*)
- del /q EventLoggerMsg.h EventLoggerMsg.rc
- del /q Ice.res
+ -del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h
+ -del /q CommunicatorF.cpp $(HDIR)\CommunicatorF.h
+ -del /q Communicator.cpp $(HDIR)\Communicator.h
+ -del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
+ -del /q Connection.cpp $(HDIR)\Connection.h
+ -del /q Current.cpp $(HDIR)\Current.h
+ -del /q Endpoint.cpp $(HDIR)\Endpoint.h
+ -del /q FacetMap.cpp $(HDIR)\FacetMap.h
+ -del /q ImplicitContextF.cpp $(HDIR)\ImplicitContextF.h
+ -del /q ImplicitContext.cpp $(HDIR)\ImplicitContext.h
+ -del /q Identity.cpp $(HDIR)\Identity.h
+ -del /q LocalException.cpp $(HDIR)\LocalException.h
+ -del /q LocatorF.cpp $(HDIR)\LocatorF.h
+ -del /q Locator.cpp $(HDIR)\Locator.h
+ -del /q LoggerF.cpp $(HDIR)\LoggerF.h
+ -del /q Logger.cpp $(HDIR)\Logger.h
+ -del /q ObjectAdapterF.cpp $(HDIR)\ObjectAdapterF.h
+ -del /q ObjectAdapter.cpp $(HDIR)\ObjectAdapter.h
+ -del /q ObjectFactoryF.cpp $(HDIR)\ObjectFactoryF.h
+ -del /q ObjectFactory.cpp $(HDIR)\ObjectFactory.h
+ -del /q PluginF.cpp $(HDIR)\PluginF.h
+ -del /q Plugin.cpp $(HDIR)\Plugin.h
+ -del /q ProcessF.cpp $(HDIR)\ProcessF.h
+ -del /q Process.cpp $(HDIR)\Process.h
+ -del /q PropertiesF.cpp $(HDIR)\PropertiesF.h
+ -del /q Properties.cpp $(HDIR)\Properties.h
+ -del /q RouterF.cpp $(HDIR)\RouterF.h
+ -del /q Router.cpp $(HDIR)\Router.h
+ -del /q ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h
+ -del /q ServantLocator.cpp $(HDIR)\ServantLocator.h
+ -del /q SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h
+ -del /q StatsF.cpp $(HDIR)\StatsF.h
+ -del /q Stats.cpp $(HDIR)\Stats.h
+ -del /q EventLoggerMsg.h EventLoggerMsg.rc
+ -del /q Ice.res
install:: all
copy $(LIBNAME) $(install_libdir)
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak index d985985b60b..bfb33891aac 100644 --- a/cpp/src/IceBox/Makefile.mak +++ b/cpp/src/IceBox/Makefile.mak @@ -12,7 +12,15 @@ top_srcdir = ..\.. LIBNAME = $(top_srcdir)\lib\icebox$(LIBSUFFIX).lib
DLLNAME = $(top_srcdir)\bin\icebox$(SOVERSION)$(LIBSUFFIX).dll
-SERVER = $(top_srcdir)\bin\icebox$(LIBSUFFIX).exe
+SERVER_D = $(top_srcdir)\bin\iceboxd.exe
+SERVER_R = $(top_srcdir)\bin\icebox.exe
+
+!if "$(OPTIMIZE)" != "yes"
+SERVER = $(SERVER_D)
+!else
+SERVER = $(SERVER_R)
+!endif
+
ADMIN = $(top_srcdir)\bin\iceboxadmin.exe
TARGETS = $(LIBNAME) $(DLLNAME) $(SERVER) $(ADMIN)
@@ -76,11 +84,10 @@ $(ADMIN): $(AOBJS) IceBoxAdmin.res $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
clean::
- del /q IceBox.cpp $(HDIR)\IceBox.h
- del /q $(DLLNAME:.dll=.*)
- del /q $(SERVER:.exe=.*)
- del /q $(ADMIN:.exe=.*)
- del /q IceBox.res IceBoxAdmin.res IceBoxExe.res
+ -del /q IceBox.cpp $(HDIR)\IceBox.h
+ -del /q $(SERVER_D:.exe=.*) $(SERVER_R:.exe=.*)
+ -del /q $(ADMIN:.exe=.*)
+ -del /q IceBox.res IceBoxAdmin.res IceBoxExe.res
install:: all
copy $(LIBNAME) $(install_libdir)
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 83b05677bea..35411ce7c2a 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -176,20 +176,16 @@ Grammar.cpp Grammar.h: Grammar.y del /q Grammar.output
clean::
- del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
- del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
- del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
-
-clean::
- del /q Internal.cpp Internal.h
- del /q $(ADMIN:.exe=.*)
- del /q $(NODE_SERVER:.exe=.*)
- del /q $(REGISTRY_SERVER:.exe=.*)
- del /q IceGridAdmin.res IceGridNode.res IceGridRegistry.res
-
-clean::
- del /q Grammar.cpp Grammar.h
- del /q Scanner.cpp
+ -del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp
+ -del /q StringAdapterInfoDict.h StringAdapterInfoDict.cpp
+ -del /q IdentityObjectInfoDict.h IdentityObjectInfoDict.cpp
+ -del /q Internal.cpp Internal.h
+ -del /q $(ADMIN:.exe=.*)
+ -del /q $(NODE_SERVER:.exe=.*)
+ -del /q $(REGISTRY_SERVER:.exe=.*)
+ -del /q IceGridAdmin.res IceGridNode.res IceGridRegistry.res
+ -del /q Grammar.cpp Grammar.h
+ -del /q Scanner.cpp
install:: all
copy $(ADMIN) $(install_bindir)
diff --git a/cpp/src/IceGridLib/Makefile.mak b/cpp/src/IceGridLib/Makefile.mak index bb65912f7ab..4f155009f65 100644 --- a/cpp/src/IceGridLib/Makefile.mak +++ b/cpp/src/IceGridLib/Makefile.mak @@ -57,18 +57,17 @@ $(DLLNAME): $(LIB_OBJS) IceGrid.res @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
clean::
- del /q FileParser.cpp $(HDIR)\FileParser.h
- del /q Admin.cpp $(HDIR)\Admin.h
- del /q Descriptor.cpp $(HDIR)\Descriptor.h
- del /q Exception.cpp $(HDIR)\Exception.h
- del /q Locator.cpp $(HDIR)\Locator.h
- del /q Observer.cpp $(HDIR)\Observer.h
- del /q Query.cpp $(HDIR)\Query.h
- del /q Session.cpp $(HDIR)\Session.h
- del /q Registry.cpp $(HDIR)\Registry.h
- del /q UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h
- del /q $(DLLNAME:.dll=.*)
- del /q IceGrid.res
+ -del /q FileParser.cpp $(HDIR)\FileParser.h
+ -del /q Admin.cpp $(HDIR)\Admin.h
+ -del /q Descriptor.cpp $(HDIR)\Descriptor.h
+ -del /q Exception.cpp $(HDIR)\Exception.h
+ -del /q Locator.cpp $(HDIR)\Locator.h
+ -del /q Observer.cpp $(HDIR)\Observer.h
+ -del /q Query.cpp $(HDIR)\Query.h
+ -del /q Session.cpp $(HDIR)\Session.h
+ -del /q Registry.cpp $(HDIR)\Registry.h
+ -del /q UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h
+ -del /q IceGrid.res
install:: all
copy $(LIBNAME) $(install_libdir)
diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak index 6bc42a78449..5885ec96e95 100644 --- a/cpp/src/IcePatch2/Makefile.mak +++ b/cpp/src/IcePatch2/Makefile.mak @@ -93,13 +93,12 @@ $(CALC): $(CALCOBJS) IcePatch2Calc.res $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest
clean::
- del /q FileInfo.cpp $(HDIR)\FileInfo.h
- del /q FileServer.cpp $(HDIR)\FileServer.h
- del /q $(DLLNAME:.dll=.*)
- del /q $(SERVER:.exe=.*)
- del /q $(CLIENT:.exe=.*)
- del /q $(CALC:.exe=.*)
- del /q IcePatch.res IcePatch2Server.res IcePatch2Client.res IcePatch2Calc.res
+ -del /q FileInfo.cpp $(HDIR)\FileInfo.h
+ -del /q FileServer.cpp $(HDIR)\FileServer.h
+ -del /q $(SERVER:.exe=.*)
+ -del /q $(CLIENT:.exe=.*)
+ -del /q $(CALC:.exe=.*)
+ -del /q IcePatch.res IcePatch2Server.res IcePatch2Client.res IcePatch2Calc.res
install:: all
copy $(LIBNAME) $(install_libdir)
diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak index 39c83062e33..67c1f78c381 100644 --- a/cpp/src/IceSSL/Makefile.mak +++ b/cpp/src/IceSSL/Makefile.mak @@ -58,8 +58,7 @@ $(DLLNAME): $(OBJS) IceSSL.res @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
clean::
- del /q $(DLLNAME:.dll=.*)
- del /q IceSSL.res
+ -del /q IceSSL.res
install:: all
copy $(LIBNAME) $(install_libdir)
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index 9f9108ccfd0..5d6680b0249 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -12,8 +12,19 @@ top_srcdir = ..\.. LIBNAME = $(top_srcdir)\lib\icestorm$(LIBSUFFIX).lib
DLLNAME = $(top_srcdir)\bin\icestorm$(SOVERSION)$(LIBSUFFIX).dll
-SVCLIBNAME = $(top_srcdir)\lib\icestormservice$(LIBSUFFIX).lib
-SVCDLLNAME = $(top_srcdir)\bin\icestormservice$(SOVERSION)$(LIBSUFFIX).dll
+SVCLIBNAME_D = $(top_srcdir)\lib\icestormserviced.lib
+SVCDLLNAME_D = $(top_srcdir)\bin\icestormservice$(SOVERSION)d.dll
+
+SVCLIBNAME_R = $(top_srcdir)\lib\icestormservice.lib
+SVCDLLNAME_R = $(top_srcdir)\bin\icestormservice$(SOVERSION).dll
+
+!if "$(OPTIMIZE)" != "yes"
+SVCLIBNAME = $(SVCLIBNAME_D)
+SVCDLLNAME = $(SVCDLLNAME_D)
+!else
+SVCLIBNAME = $(SVCLIBNAME_R)
+SVCDLLNAME = $(SVCDLLNAME_R)
+!endif
ADMIN = $(top_srcdir)\bin\icestormadmin.exe
MIGRATE = $(top_srcdir)\bin\icestormmigrate.exe
@@ -175,18 +186,18 @@ clean:: del /q V32FormatDB.cpp V31FormatDB.cpp V31FormatDB.h V31FormatDB.h
clean::
- del /q IceStorm.cpp $(HDIR)\IceStorm.h
- del /q IceStormInternal.cpp IceStormInternal.h
- del /q V32Migrate.cpp V32Migrate.h
- del /q V31Migrate.cpp V31Migrate.h
- del /q LinkRecord.cpp LinkRecord.h
- del /q Election.cpp Election.h
- del /q SubscriberRecord.cpp SubscriberRecord.h
- del /q $(DLLNAME:.dll=.*)
- del /q $(SVCDLLNAME:.dll=.*)
- del /q $(ADMIN:.exe=.*)
- del /q $(MIGRATE:.exe=.*)
- del /q IceStormAdmin.res IceStormMigrate.res IceStorm.res IceStormService.res
+ -del /q IceStorm.cpp $(HDIR)\IceStorm.h
+ -del /q IceStormInternal.cpp IceStormInternal.h
+ -del /q V32Migrate.cpp V32Migrate.h
+ -del /q V31Migrate.cpp V31Migrate.h
+ -del /q LinkRecord.cpp LinkRecord.h
+ -del /q Election.cpp Election.h
+ -del /q SubscriberRecord.cpp SubscriberRecord.h
+ -del /q $(SVCDLLNAME_R:.dll=.*) $(SVCDLLNAME_D:.dll=.*)
+ -del /q $(SVCLIBNAME_R) $(SVCLIBNAME_D)
+ -del /q $(ADMIN:.exe=.*)
+ -del /q $(MIGRATE:.exe=.*)
+ -del /q IceStormAdmin.res IceStormMigrate.res IceStorm.res IceStormService.res
clean::
del /q Grammar.cpp Grammar.h
diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak index 745b3cf3411..745a9163d9b 100644 --- a/cpp/src/IceUtil/Makefile.mak +++ b/cpp/src/IceUtil/Makefile.mak @@ -74,8 +74,7 @@ $(DLLNAME): $(OBJS) IceUtil.res !endif
clean::
- del /q $(DLLNAME:.dll=.*)
- del /q IceUtil.res
+ -del /q IceUtil.res
install:: all
copy $(LIBNAME) $(install_libdir)
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak index 4d68cc64ece..89d8ed0df21 100644 --- a/cpp/src/IceXML/Makefile.mak +++ b/cpp/src/IceXML/Makefile.mak @@ -44,8 +44,7 @@ $(DLLNAME): $(OBJS) IceXML.res @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
clean::
- del /q $(DLLNAME:.dll=.*)
- del /q IceXML.res
+ -del /q IceXML.res
install:: all
copy $(LIBNAME) $(install_libdir)
diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak index 58bcb71be62..5f2cc8cb487 100644 --- a/cpp/src/Slice/Makefile.mak +++ b/cpp/src/Slice/Makefile.mak @@ -81,10 +81,9 @@ Grammar.cpp Grammar.h: Grammar.y del /q Grammar.output
clean::
- del /q Grammar.cpp Grammar.h
- del /q Scanner.cpp
- del /q $(DLLNAME:.dll=.*)
- del /q Slice.res
+ -del /q Grammar.cpp Grammar.h
+ -del /q Scanner.cpp
+ -del /q Slice.res
install:: all
copy $(LIBNAME) $(install_libdir)
|