diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-02-01 19:00:35 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-02-01 19:00:35 +0000 |
| commit | e3ba377befdba2d678f4c89baf457241be447680 (patch) | |
| tree | 12330aa08d0ea32316f30294791d34e92789a9fe /cpp | |
| parent | Fixed bug #1562 (diff) | |
| download | ice-e3ba377befdba2d678f4c89baf457241be447680.tar.bz2 ice-e3ba377befdba2d678f4c89baf457241be447680.tar.xz ice-e3ba377befdba2d678f4c89baf457241be447680.zip | |
Remove .exp files
Diffstat (limited to 'cpp')
110 files changed, 212 insertions, 2 deletions
diff --git a/cpp/demo/Database/Oracle/occi/Makefile.mak b/cpp/demo/Database/Oracle/occi/Makefile.mak index 999e7599ed0..366f19ad36b 100755 --- a/cpp/demo/Database/Oracle/occi/Makefile.mak +++ b/cpp/demo/Database/Oracle/occi/Makefile.mak @@ -66,12 +66,14 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) rm -f $@ $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) DbTypes.h DbTypes.cpp DbTypesMap.h DbTypesMap.cpp DbTypesOut.typ: DbTypes.typ ott userid=scott/tiger@orcl code=cpp hfile=DbTypes.h cppfile=DbTypes.cpp mapfile=DbTypesMap.cpp \ diff --git a/cpp/demo/Database/Oracle/proc/Makefile.mak b/cpp/demo/Database/Oracle/proc/Makefile.mak index f384fb02897..da4d59e3d72 100755 --- a/cpp/demo/Database/Oracle/proc/Makefile.mak +++ b/cpp/demo/Database/Oracle/proc/Makefile.mak @@ -54,11 +54,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(ORACLE_LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q HR.cpp HR.h diff --git a/cpp/demo/Freeze/bench/Makefile.mak b/cpp/demo/Freeze/bench/Makefile.mak index 16dc5403f1b..f1017c9dd82 100644 --- a/cpp/demo/Freeze/bench/Makefile.mak +++ b/cpp/demo/Freeze/bench/Makefile.mak @@ -29,6 +29,7 @@ $(CLIENT): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) BenchTypes.h BenchTypes.cpp: Test.ice $(SLICE2FREEZE) del /q BenchTypes.h BenchTypes.cpp diff --git a/cpp/demo/Freeze/library/Makefile.mak b/cpp/demo/Freeze/library/Makefile.mak index cc93e9045cf..1cf5be89240 100644 --- a/cpp/demo/Freeze/library/Makefile.mak +++ b/cpp/demo/Freeze/library/Makefile.mak @@ -57,16 +57,19 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(COLLOCATED): $(OBJS) $(COLOBJS) $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(OBJS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib -if exist $(COLLOCATED).manifest \ mt -nologo -manifest $(COLLOCATED).manifest -outputresource:$(COLLOCATED);#1 & del /q $(COLLOCATED).manifest + -if exist $(COLLOCATED:.exe=.exp) del /q $(COLLOCATED:.exe=.exp) LibraryTypes.h LibraryTypes.cpp: Library.ice $(SLICE2FREEZE) del /q LibraryTypes.h LibraryTypes.cpp diff --git a/cpp/demo/Freeze/phonebook/Makefile.mak b/cpp/demo/Freeze/phonebook/Makefile.mak index b7823d176ed..dd31dfc8a08 100644 --- a/cpp/demo/Freeze/phonebook/Makefile.mak +++ b/cpp/demo/Freeze/phonebook/Makefile.mak @@ -56,16 +56,19 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(COLLOCATED): $(OBJS) $(COLOBJS) $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(OBJS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib -if exist $(COLLOCATED).manifest \ mt -nologo -manifest $(COLLOCATED).manifest -outputresource:$(COLLOCATED);#1 & del /q $(COLLOCATED).manifest + -if exist $(COLLOCATED:.exe=.exp) del /q $(COLLOCATED:.exe=.exp) NameIndex.h NameIndex.cpp: PhoneBook.ice $(SLICE2FREEZE) del /q NameIndex.h NameIndex.cpp diff --git a/cpp/demo/Glacier2/callback/Makefile.mak b/cpp/demo/Glacier2/callback/Makefile.mak index 864b4ccc0f6..3c88421037f 100644 --- a/cpp/demo/Glacier2/callback/Makefile.mak +++ b/cpp/demo/Glacier2/callback/Makefile.mak @@ -44,17 +44,20 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(SESSION_SERVER): $(SSOBJS) $(LINK) $(LD_EXEFLAGS) $(SSPDBFLAGS) $(SSOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(SESSION_SERVER).manifest \ mt -nologo -manifest $(SESSION_SERVER).manifest -outputresource:$(SESSION_SERVER);#1 & \ del /q $(SESSION_SERVER).manifest + -if exist $(SESSION_SERVER:.exe=.exp) del /q $(SESSION_SERVER:.exe=.exp) clean:: del /q Callback.cpp Callback.h diff --git a/cpp/demo/Glacier2/chat/Makefile.mak b/cpp/demo/Glacier2/chat/Makefile.mak index 933cc0d4f3e..1c966177d84 100644 --- a/cpp/demo/Glacier2/chat/Makefile.mak +++ b/cpp/demo/Glacier2/chat/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Chat.cpp Chat.h diff --git a/cpp/demo/Ice/MFC/client/Makefile.mak b/cpp/demo/Ice/MFC/client/Makefile.mak index 212c05f9db3..b438cb6fde4 100755 --- a/cpp/demo/Ice/MFC/client/Makefile.mak +++ b/cpp/demo/Ice/MFC/client/Makefile.mak @@ -33,6 +33,7 @@ $(CLIENT): $(OBJS) $(COBJS) HelloClient.res $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) HelloClient.res: HelloClient.rc rc.exe HelloClient.rc diff --git a/cpp/demo/Ice/MFC/server/Makefile.mak b/cpp/demo/Ice/MFC/server/Makefile.mak index 854660d77b6..33778d23873 100755 --- a/cpp/demo/Ice/MFC/server/Makefile.mak +++ b/cpp/demo/Ice/MFC/server/Makefile.mak @@ -35,6 +35,7 @@ $(SERVER): $(OBJS) $(COBJS) HelloServer.res $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) HelloServer.res: HelloServer.rc rc.exe HelloServer.rc diff --git a/cpp/demo/Ice/async/Makefile.mak b/cpp/demo/Ice/async/Makefile.mak index 2394a491ded..c7cab712d31 100644 --- a/cpp/demo/Ice/async/Makefile.mak +++ b/cpp/demo/Ice/async/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Hello.cpp Hello.h diff --git a/cpp/demo/Ice/bidir/Makefile.mak b/cpp/demo/Ice/bidir/Makefile.mak index ed365c4bfca..7ef74c98dc6 100644 --- a/cpp/demo/Ice/bidir/Makefile.mak +++ b/cpp/demo/Ice/bidir/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Callback.cpp Callback.h diff --git a/cpp/demo/Ice/callback/Makefile.mak b/cpp/demo/Ice/callback/Makefile.mak index 9e47b23ae68..5f2f8480738 100644 --- a/cpp/demo/Ice/callback/Makefile.mak +++ b/cpp/demo/Ice/callback/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Callback.cpp Callback.h diff --git a/cpp/demo/Ice/converter/Makefile.mak b/cpp/demo/Ice/converter/Makefile.mak index 60db433c9cd..5953251d0b3 100644 --- a/cpp/demo/Ice/converter/Makefile.mak +++ b/cpp/demo/Ice/converter/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Echo.cpp Echo.h diff --git a/cpp/demo/Ice/hello/Makefile.mak b/cpp/demo/Ice/hello/Makefile.mak index 5cae94ecbe2..d0a9cf11650 100644 --- a/cpp/demo/Ice/hello/Makefile.mak +++ b/cpp/demo/Ice/hello/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Hello.cpp Hello.h diff --git a/cpp/demo/Ice/invoke/Makefile.mak b/cpp/demo/Ice/invoke/Makefile.mak index 023ff0a0cd1..120f301cbbb 100644 --- a/cpp/demo/Ice/invoke/Makefile.mak +++ b/cpp/demo/Ice/invoke/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Printer.cpp Printer.h diff --git a/cpp/demo/Ice/latency/Makefile.mak b/cpp/demo/Ice/latency/Makefile.mak index 271d43c597e..8c862a024f2 100644 --- a/cpp/demo/Ice/latency/Makefile.mak +++ b/cpp/demo/Ice/latency/Makefile.mak @@ -37,11 +37,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Latency.cpp Latency.h diff --git a/cpp/demo/Ice/minimal/Makefile.mak b/cpp/demo/Ice/minimal/Makefile.mak index 5cae94ecbe2..d0a9cf11650 100644 --- a/cpp/demo/Ice/minimal/Makefile.mak +++ b/cpp/demo/Ice/minimal/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Hello.cpp Hello.h diff --git a/cpp/demo/Ice/nested/Makefile.mak b/cpp/demo/Ice/nested/Makefile.mak index ac4d55e37ec..6ec4aadee8a 100644 --- a/cpp/demo/Ice/nested/Makefile.mak +++ b/cpp/demo/Ice/nested/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Nested.cpp Nested.h diff --git a/cpp/demo/Ice/session/Makefile.mak b/cpp/demo/Ice/session/Makefile.mak index 96cee989160..93fcd21c898 100644 --- a/cpp/demo/Ice/session/Makefile.mak +++ b/cpp/demo/Ice/session/Makefile.mak @@ -40,11 +40,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Session.cpp Session.h diff --git a/cpp/demo/Ice/throughput/Makefile.mak b/cpp/demo/Ice/throughput/Makefile.mak index 8620bf61794..34b1c847a03 100644 --- a/cpp/demo/Ice/throughput/Makefile.mak +++ b/cpp/demo/Ice/throughput/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Throughput.cpp Throughput.h diff --git a/cpp/demo/Ice/value/Makefile.mak b/cpp/demo/Ice/value/Makefile.mak index 7c5be0aeed0..bca62972cf3 100644 --- a/cpp/demo/Ice/value/Makefile.mak +++ b/cpp/demo/Ice/value/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Value.cpp Value.h diff --git a/cpp/demo/IceBox/hello/Makefile.mak b/cpp/demo/IceBox/hello/Makefile.mak index 6506139047c..e77df4a7e1c 100644 --- a/cpp/demo/IceBox/hello/Makefile.mak +++ b/cpp/demo/IceBox/hello/Makefile.mak @@ -45,11 +45,13 @@ $(DLLNAME): $(OBJS) $(SOBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$(DLLNAME) $(PRELIBS)$(LINKWITH) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) clean:: del /q Hello.cpp Hello.h diff --git a/cpp/demo/IceGrid/allocate/Makefile.mak b/cpp/demo/IceGrid/allocate/Makefile.mak index 9f8b0cce2a0..ebd55126ebd 100644 --- a/cpp/demo/IceGrid/allocate/Makefile.mak +++ b/cpp/demo/IceGrid/allocate/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(OBJS) $(COBJS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Hello.cpp Hello.h diff --git a/cpp/demo/IceGrid/replication/Makefile.mak b/cpp/demo/IceGrid/replication/Makefile.mak index 9f8b0cce2a0..ebd55126ebd 100644 --- a/cpp/demo/IceGrid/replication/Makefile.mak +++ b/cpp/demo/IceGrid/replication/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(OBJS) $(COBJS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Hello.cpp Hello.h diff --git a/cpp/demo/IceGrid/sessionActivation/Makefile.mak b/cpp/demo/IceGrid/sessionActivation/Makefile.mak index 610bc1ea860..0817fab375f 100644 --- a/cpp/demo/IceGrid/sessionActivation/Makefile.mak +++ b/cpp/demo/IceGrid/sessionActivation/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(OBJS) $(COBJS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Hello.cpp Hello.h diff --git a/cpp/demo/IceGrid/simple/Makefile.mak b/cpp/demo/IceGrid/simple/Makefile.mak index 9f8b0cce2a0..ebd55126ebd 100644 --- a/cpp/demo/IceGrid/simple/Makefile.mak +++ b/cpp/demo/IceGrid/simple/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(OBJS) $(COBJS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Hello.cpp Hello.h diff --git a/cpp/demo/IcePatch2/MFC/Makefile.mak b/cpp/demo/IcePatch2/MFC/Makefile.mak index 62f626fb6b5..d49007f816f 100755 --- a/cpp/demo/IcePatch2/MFC/Makefile.mak +++ b/cpp/demo/IcePatch2/MFC/Makefile.mak @@ -33,6 +33,7 @@ $(CLIENT): $(OBJS) $(COBJS) PatchClient.res PatchClient.res $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) PatchClient.res: PatchClient.rc rc.exe PatchClient.rc diff --git a/cpp/demo/IceStorm/clock/Makefile.mak b/cpp/demo/IceStorm/clock/Makefile.mak index 2f8193465eb..ced1fc12eef 100644 --- a/cpp/demo/IceStorm/clock/Makefile.mak +++ b/cpp/demo/IceStorm/clock/Makefile.mak @@ -39,11 +39,13 @@ $(PUBLISHER): $(OBJS) $(POBJS) $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(PUBLISHER).manifest \ mt -nologo -manifest $(PUBLISHER).manifest -outputresource:$(PUBLISHER);#1 & del /q $(PUBLISHER).manifest + -if exist $(PUBLISHER:.exe=.exp) del /q $(PUBLISHER:.exe=.exp) $(SUBSCRIBER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SUBSCRIBER).manifest \ mt -nologo -manifest $(SUBSCRIBER).manifest -outputresource:$(SUBSCRIBER);#1 & del /q $(SUBSCRIBER).manifest + -if exist $(SUBSCRIBER:.exe=.exp) del /q $(SUBSCRIBER:.exe=.exp) clean:: del /q Clock.cpp Clock.h diff --git a/cpp/demo/IceStorm/counter/Makefile.mak b/cpp/demo/IceStorm/counter/Makefile.mak index 27d7a96f490..ea2dc50d901 100644 --- a/cpp/demo/IceStorm/counter/Makefile.mak +++ b/cpp/demo/IceStorm/counter/Makefile.mak @@ -41,11 +41,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(IS_LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Counter.cpp Counter.h diff --git a/cpp/demo/IceStorm/replicated/Makefile.mak b/cpp/demo/IceStorm/replicated/Makefile.mak index 432435eaa8d..fe632b3c739 100644 --- a/cpp/demo/IceStorm/replicated/Makefile.mak +++ b/cpp/demo/IceStorm/replicated/Makefile.mak @@ -39,11 +39,13 @@ $(PUBLISHER): $(OBJS) $(POBJS) $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(PUBLISHER).manifest \ mt -nologo -manifest $(PUBLISHER).manifest -outputresource:$(PUBLISHER);#1 & del /q $(PUBLISHER).manifest + -if exist $(PUBLISHER:.exe=.exp) del /q $(PUBLISHER:.exe=.exp) $(SUBSCRIBER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SUBSCRIBER).manifest \ mt -nologo -manifest $(SUBSCRIBER).manifest -outputresource:$(SUBSCRIBER);#1 & del /q $(SUBSCRIBER).manifest + -if exist $(SUBSCRIBER:.exe=.exp) del /q $(SUBSCRIBER:.exe=.exp) clean:: del /q Clock.cpp Clock.h diff --git a/cpp/demo/IceUtil/workqueue/Makefile.mak b/cpp/demo/IceUtil/workqueue/Makefile.mak index c14e12e34d1..a18a9f64f84 100644 --- a/cpp/demo/IceUtil/workqueue/Makefile.mak +++ b/cpp/demo/IceUtil/workqueue/Makefile.mak @@ -29,5 +29,6 @@ $(CLIENT): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) !include .depend diff --git a/cpp/demo/book/printer/Makefile.mak b/cpp/demo/book/printer/Makefile.mak index 3e3d7ad50dd..17d12e11464 100644 --- a/cpp/demo/book/printer/Makefile.mak +++ b/cpp/demo/book/printer/Makefile.mak @@ -37,11 +37,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Printer.cpp Printer.h diff --git a/cpp/demo/book/simple_filesystem/Makefile.mak b/cpp/demo/book/simple_filesystem/Makefile.mak index 6ad53932ba4..f44d70db6a5 100644 --- a/cpp/demo/book/simple_filesystem/Makefile.mak +++ b/cpp/demo/book/simple_filesystem/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Filesystem.cpp Filesystem.h diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak index 0b6f5407b60..776689c0901 100644 --- a/cpp/src/Freeze/Makefile.mak +++ b/cpp/src/Freeze/Makefile.mak @@ -60,6 +60,7 @@ $(DLLNAME): $(OBJS) move $(DLLNAME:.dll=.lib) $(LIBNAME) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice del /q $(HDIR)\Catalog.h Catalog.cpp diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak index ca68a990b9a..b78dde87e99 100644 --- a/cpp/src/FreezeScript/Makefile.mak +++ b/cpp/src/FreezeScript/Makefile.mak @@ -50,12 +50,15 @@ DPDBFLAGS = /pdb:$(DUMPDB:.exe=.pdb) $(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) $(LINK) $(LD_EXEFLAGS) $(TPDBFLAGS) $(TRANSFORM_OBJS) $(COMMON_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(TRANSFORMDB).manifest \ - mt -nologo -manifest $(TRANSFORMDB).manifest -outputresource:$(TRANSFORMDB);#1 & del /q $(TRANSFORMDB).manifest + mt -nologo -manifest $(TRANSFORMDB).manifest -outputresource:$(TRANSFORMDB);#1 & \ + del /q $(TRANSFORMDB).manifest + -if exist $(TRANSFORMDB:.exe=.exp) del /q $(TRANSFORMDB:.exe=.exp) $(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) $(LINK) $(LD_EXEFLAGS) $(DPDBFLAGS) $(DUMP_OBJS) $(COMMON_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(DUMPDB).manifest \ mt -nologo -manifest $(DUMPDB).manifest -outputresource:$(DUMPDB);#1 & del /q $(DUMPDB).manifest + -if exist $(DUMPDB:.exe=.exp) del /q $(DUMPDB:.exe=.exp) Scanner.cpp : Scanner.l flex Scanner.l diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak index 59164faa9e6..b9797393103 100644 --- a/cpp/src/Glacier2/Makefile.mak +++ b/cpp/src/Glacier2/Makefile.mak @@ -78,11 +78,13 @@ $(DLLNAME): $(OBJS) move $(DLLNAME:.dll=.lib) $(LIBNAME) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(ROUTER): $(ROBJS) $(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(ROBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(ROUTER).manifest \ mt -nologo -manifest $(ROUTER).manifest -outputresource:$(ROUTER);#1 & del /q $(ROUTER).manifest + -if exist $(ROUTER:.exe=.exp) del /q $(ROUTER:.exe=.exp) !ifdef BUILD_UTILS diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 6142cd14dcd..ac64852f29f 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -126,6 +126,7 @@ $(DLLNAME): $(OBJS) move $(DLLNAME:.dll=.lib) $(LIBNAME) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) EventLoggerI.obj: EventLoggerMsg.h diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak index 73393116005..d06c6cbe3af 100644 --- a/cpp/src/IceBox/Makefile.mak +++ b/cpp/src/IceBox/Makefile.mak @@ -67,16 +67,19 @@ $(DLLNAME): $(OBJS) move $(DLLNAME:.dll=.lib) $(LIBNAME) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icebox$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(ADMIN): $(AOBJS) $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icebox$(LIBSUFFIX).lib -if exist $(ADMIN).manifest \ mt -nologo -manifest $(ADMIN).manifest -outputresource:$(ADMIN);#1 & del /q $(ADMIN).manifest + -if exist $(ADMIN:.exe=.exp) del /q $(ADMIN:.exe=.exp) !ifdef BUILD_UTILS diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 721045b75a4..f11c23505f4 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -157,23 +157,27 @@ $(DLLNAME): $(LIB_OBJS) move $(DLLNAME:.dll=.lib) $(LIBNAME) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(ADMIN): $(ADMIN_OBJS) $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(ADMIN_OBJS) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH) -if exist $(ADMIN).manifest \ mt -nologo -manifest $(ADMIN).manifest -outputresource:$(ADMIN);#1 & del /q $(ADMIN).manifest + -if exist $(ADMIN:.exe=.exp) del /q $(ADMIN:.exe=.exp) $(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) $(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(REGISTRY_SVR_OBJS) $(PREOUT)$@ $(PRELIBS)$(NLINKWITH) -if exist $(REGISTRY_SERVER).manifest \ mt -nologo -manifest $(REGISTRY_SERVER).manifest -outputresource:$(REGISTRY_SERVER);#1 & \ del /q $(REGISTRY_SERVER).manifest + -if exist $(REGISTRY_SERVER:.exe=.exp) del /q $(REGISTRY_SERVER:.exe=.exp) $(NODE_SERVER): $(NODE_SVR_OBJS) $(LINK) $(LD_EXEFLAGS) $(NPDBFLAGS) $(NODE_SVR_OBJS) $(PREOUT)$@ $(PRELIBS)$(NLINKWITH) -if exist $(NODE_SERVER).manifest \ mt -nologo -manifest $(NODE_SERVER).manifest -outputresource:$(NODE_SERVER);#1 & \ del /q $(NODE_SERVER).manifest + -if exist $(NODE_SERVER:.exe=.exp) del /q $(NODE_SERVER:.exe=.exp) StringApplicationInfoDict.h StringApplicationInfoDict.cpp: $(SLICE2FREEZE) del /q StringApplicationInfoDict.h StringApplicationInfoDict.cpp diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak index 42a6fa43642..6176f76b4c0 100644 --- a/cpp/src/IcePatch2/Makefile.mak +++ b/cpp/src/IcePatch2/Makefile.mak @@ -75,21 +75,25 @@ $(DLLNAME): $(OBJS) move $(DLLNAME:.dll=.lib) $(LIBNAME) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icepatch2$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icepatch2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(CALC): $(CALCOBJS) $(LINK) $(LD_EXEFLAGS) $(CAPDBFLAGS) $(CALCOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icepatch2$(LIBSUFFIX).lib -if exist $(CALC).manifest \ mt -nologo -manifest $(CALC).manifest -outputresource:$(CALC);#1 & del /q $(CALC).manifest + -if exist $(CALC:.exe=.exp) del /q $(CALC:.exe=.exp) !ifdef BUILD_UTILS diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak index 872728d1a16..afa1a81ffc7 100644 --- a/cpp/src/IceSSL/Makefile.mak +++ b/cpp/src/IceSSL/Makefile.mak @@ -49,6 +49,7 @@ $(DLLNAME): $(OBJS) move $(DLLNAME:.dll=.lib) $(LIBNAME) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) clean:: del /q $(DLLNAME:.dll=.*) diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index 48736fde69f..d61f04035bd 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -84,6 +84,7 @@ $(DLLNAME): $(OBJS) move $(DLLNAME:.dll=.lib) $(LIBNAME) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(SVCLIBNAME): $(SVCDLLNAME) @@ -92,11 +93,13 @@ $(SVCDLLNAME): $(SERVICE_OBJS) move $(SVCDLLNAME:.dll=.lib) $(SVCLIBNAME) -if exist $(SVCDLLNAME).manifest \ mt -nologo -manifest $(SVCDLLNAME).manifest -outputresource:$(SVCDLLNAME);#2 & del /q $(SVCDLLNAME).manifest + -if exist $(SVCDLLNAME:.dll=.exp) del /q $(SVCDLLNAME:.dll=.exp) $(ADMIN): $(AOBJS) $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH) -if exist $(ADMIN).manifest \ mt -nologo -manifest $(ADMIN).manifest -outputresource:$(ADMIN);#1 & del /q $(ADMIN).manifest + -if exist $(ADMIN:.exe=.exp) del /q $(ADMIN:.exe=.exp) ..\IceStorm\PersistentTopicMap.h PersistentTopicMap.cpp: ..\IceStorm\LinkRecord.ice $(slicedir)\Ice\Identity.ice $(SLICE2FREEZE) del /q PersistentTopicMap.h PersistentTopicMap.cpp diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak index f5f4c0060f5..862d7536ea5 100644 --- a/cpp/src/IceUtil/Makefile.mak +++ b/cpp/src/IceUtil/Makefile.mak @@ -54,6 +54,7 @@ $(DLLNAME): $(OBJS) move $(DLLNAME:.dll=.lib) $(LIBNAME) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) clean:: del /q $(DLLNAME:.dll=.*) diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak index 411cc568740..53c9b5b951d 100644 --- a/cpp/src/IceXML/Makefile.mak +++ b/cpp/src/IceXML/Makefile.mak @@ -35,6 +35,7 @@ $(DLLNAME): $(OBJS) move $(DLLNAME:.dll=.lib) $(LIBNAME) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) clean:: del /q $(DLLNAME:.dll=.*) diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak index c8f4575c3bc..686eb1c6790 100644 --- a/cpp/src/Slice/Makefile.mak +++ b/cpp/src/Slice/Makefile.mak @@ -44,6 +44,7 @@ $(DLLNAME): $(OBJS) move $(DLLNAME:.dll=.lib) $(LIBNAME) -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) Scanner.cpp : Scanner.l flex Scanner.l diff --git a/cpp/src/icecpp/Makefile.mak b/cpp/src/icecpp/Makefile.mak index aa56c89bde9..4febb9649c3 100644 --- a/cpp/src/icecpp/Makefile.mak +++ b/cpp/src/icecpp/Makefile.mak @@ -39,6 +39,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) install:: all copy $(NAME) $(install_bindir) diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak index cdb0844c1fe..20907633a75 100644 --- a/cpp/src/slice2cpp/Makefile.mak +++ b/cpp/src/slice2cpp/Makefile.mak @@ -30,6 +30,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2cppe/Makefile.mak b/cpp/src/slice2cppe/Makefile.mak index c12b25ab7a9..c8816b3ea7c 100644 --- a/cpp/src/slice2cppe/Makefile.mak +++ b/cpp/src/slice2cppe/Makefile.mak @@ -30,6 +30,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2cs/Makefile.mak b/cpp/src/slice2cs/Makefile.mak index a2b8fa703b6..fbbbcaed458 100644 --- a/cpp/src/slice2cs/Makefile.mak +++ b/cpp/src/slice2cs/Makefile.mak @@ -30,6 +30,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2docbook/Makefile.mak b/cpp/src/slice2docbook/Makefile.mak index 6ba3a55654c..a35bfef4171 100644 --- a/cpp/src/slice2docbook/Makefile.mak +++ b/cpp/src/slice2docbook/Makefile.mak @@ -30,6 +30,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2freeze/Makefile.mak b/cpp/src/slice2freeze/Makefile.mak index f1532a39c31..da1276bb32e 100644 --- a/cpp/src/slice2freeze/Makefile.mak +++ b/cpp/src/slice2freeze/Makefile.mak @@ -25,6 +25,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2freezej/Makefile.mak b/cpp/src/slice2freezej/Makefile.mak index da6c1965a1c..7a148e39cd8 100644 --- a/cpp/src/slice2freezej/Makefile.mak +++ b/cpp/src/slice2freezej/Makefile.mak @@ -29,6 +29,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2html/Makefile.mak b/cpp/src/slice2html/Makefile.mak index ecd93128945..e043d6aa83f 100644 --- a/cpp/src/slice2html/Makefile.mak +++ b/cpp/src/slice2html/Makefile.mak @@ -30,6 +30,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2java/Makefile.mak b/cpp/src/slice2java/Makefile.mak index b4daf797a7d..eb0ba081a2e 100644 --- a/cpp/src/slice2java/Makefile.mak +++ b/cpp/src/slice2java/Makefile.mak @@ -30,6 +30,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2javae/Makefile.mak b/cpp/src/slice2javae/Makefile.mak index 1b4bcdbe873..cd0792476a3 100644 --- a/cpp/src/slice2javae/Makefile.mak +++ b/cpp/src/slice2javae/Makefile.mak @@ -30,6 +30,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2py/Makefile.mak b/cpp/src/slice2py/Makefile.mak index d1fd8e3920f..e870a3097e2 100644 --- a/cpp/src/slice2py/Makefile.mak +++ b/cpp/src/slice2py/Makefile.mak @@ -29,6 +29,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2rb/Makefile.mak b/cpp/src/slice2rb/Makefile.mak index 05ffadeea5f..3c272e371ef 100755 --- a/cpp/src/slice2rb/Makefile.mak +++ b/cpp/src/slice2rb/Makefile.mak @@ -29,6 +29,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2vb/Makefile.mak b/cpp/src/slice2vb/Makefile.mak index 14d78e26a96..e1c54e27516 100644 --- a/cpp/src/slice2vb/Makefile.mak +++ b/cpp/src/slice2vb/Makefile.mak @@ -30,6 +30,7 @@ $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) -if exist $(NAME).manifest \ mt -nologo -manifest $(NAME).manifest -outputresource:$(NAME);#1 & del /q $(NAME).manifest + -if exist $(NAME:.exe=.exp) del /q $(NAME:.exe=.exp) clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/test/Freeze/complex/Makefile.mak b/cpp/test/Freeze/complex/Makefile.mak index bf652b52afc..0b3ab168e14 100644 --- a/cpp/test/Freeze/complex/Makefile.mak +++ b/cpp/test/Freeze/complex/Makefile.mak @@ -34,6 +34,7 @@ $(CLIENT): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) ComplexDict.h ComplexDict.cpp: Complex.ice $(SLICE2FREEZE) del /q ComplexDict.h ComplexDict.cpp diff --git a/cpp/test/Freeze/dbmap/Makefile.mak b/cpp/test/Freeze/dbmap/Makefile.mak index a28d4bbf734..44d4764af41 100644 --- a/cpp/test/Freeze/dbmap/Makefile.mak +++ b/cpp/test/Freeze/dbmap/Makefile.mak @@ -34,6 +34,7 @@ $(CLIENT): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) ByteIntMap.h ByteIntMap.cpp: $(SLICE2FREEZE) del /q ByteIntMap.h ByteIntMap.cpp diff --git a/cpp/test/Freeze/evictor/Makefile.mak b/cpp/test/Freeze/evictor/Makefile.mak index eaf46e895ee..78c8ec73903 100644 --- a/cpp/test/Freeze/evictor/Makefile.mak +++ b/cpp/test/Freeze/evictor/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Freeze/oldevictor/Makefile.mak b/cpp/test/Freeze/oldevictor/Makefile.mak index eaf46e895ee..78c8ec73903 100644 --- a/cpp/test/Freeze/oldevictor/Makefile.mak +++ b/cpp/test/Freeze/oldevictor/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/FreezeScript/dbmap/Makefile.mak b/cpp/test/FreezeScript/dbmap/Makefile.mak index dac1025dfce..9850a964c1e 100644 --- a/cpp/test/FreezeScript/dbmap/Makefile.mak +++ b/cpp/test/FreezeScript/dbmap/Makefile.mak @@ -33,6 +33,7 @@ $(CLIENT): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) IntSMap.h IntSMap.cpp: $(SLICE2FREEZE) del /q IntSMap.h IntSMap.cpp diff --git a/cpp/test/FreezeScript/evictor/Makefile.mak b/cpp/test/FreezeScript/evictor/Makefile.mak index 08f32f871cf..fc4116dfd86 100644 --- a/cpp/test/FreezeScript/evictor/Makefile.mak +++ b/cpp/test/FreezeScript/evictor/Makefile.mak @@ -32,6 +32,7 @@ $(CLIENT): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) freeze$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) clean:: del /q TestOld.cpp TestOld.h diff --git a/cpp/test/Glacier2/attack/Makefile.mak b/cpp/test/Glacier2/attack/Makefile.mak index 60aecf3b70b..50547d87a11 100644 --- a/cpp/test/Glacier2/attack/Makefile.mak +++ b/cpp/test/Glacier2/attack/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Backend.cpp Backend.h diff --git a/cpp/test/Glacier2/dynamicFiltering/Makefile.mak b/cpp/test/Glacier2/dynamicFiltering/Makefile.mak index 70df3df072f..47623940c24 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Makefile.mak +++ b/cpp/test/Glacier2/dynamicFiltering/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Glacier2/router/Makefile.mak b/cpp/test/Glacier2/router/Makefile.mak index 9570fd63e37..a2b2619aa8c 100644 --- a/cpp/test/Glacier2/router/Makefile.mak +++ b/cpp/test/Glacier2/router/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Callback.cpp Callback.h diff --git a/cpp/test/Glacier2/sessionControl/Makefile.mak b/cpp/test/Glacier2/sessionControl/Makefile.mak index 2c06f0091ff..49092f531cf 100644 --- a/cpp/test/Glacier2/sessionControl/Makefile.mak +++ b/cpp/test/Glacier2/sessionControl/Makefile.mak @@ -37,11 +37,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Session.cpp Session.h diff --git a/cpp/test/Glacier2/ssl/Makefile.mak b/cpp/test/Glacier2/ssl/Makefile.mak index 48a2496943c..a3851a4b1f3 100644 --- a/cpp/test/Glacier2/ssl/Makefile.mak +++ b/cpp/test/Glacier2/ssl/Makefile.mak @@ -34,11 +34,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib \ $(OPENSSL_LIBS) icessl$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) !include .depend diff --git a/cpp/test/Glacier2/staticFiltering/Makefile.mak b/cpp/test/Glacier2/staticFiltering/Makefile.mak index 60aecf3b70b..50547d87a11 100644 --- a/cpp/test/Glacier2/staticFiltering/Makefile.mak +++ b/cpp/test/Glacier2/staticFiltering/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Backend.cpp Backend.h diff --git a/cpp/test/Ice/adapterDeactivation/Makefile.mak b/cpp/test/Ice/adapterDeactivation/Makefile.mak index c28e6bd187d..6568d2d142a 100644 --- a/cpp/test/Ice/adapterDeactivation/Makefile.mak +++ b/cpp/test/Ice/adapterDeactivation/Makefile.mak @@ -48,16 +48,19 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(COLLOCATED): $(COLOBJS) $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(COLLOCATED).manifest \ mt -nologo -manifest $(COLLOCATED).manifest -outputresource:$(COLLOCATED);#1 & del /q $(COLLOCATED).manifest + -if exist $(COLLOCATED:.exe=.exp) del /q $(COLLOCATED:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/binding/Makefile.mak b/cpp/test/Ice/binding/Makefile.mak index 36fa46f4575..14774fadaee 100644 --- a/cpp/test/Ice/binding/Makefile.mak +++ b/cpp/test/Ice/binding/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/checksum/client/Makefile.mak b/cpp/test/Ice/checksum/client/Makefile.mak index 22cb1bcdd39..ee6f84231a5 100644 --- a/cpp/test/Ice/checksum/client/Makefile.mak +++ b/cpp/test/Ice/checksum/client/Makefile.mak @@ -33,6 +33,7 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/checksum/server/Makefile.mak b/cpp/test/Ice/checksum/server/Makefile.mak index 6cda9241420..58eb73621ab 100644 --- a/cpp/test/Ice/checksum/server/Makefile.mak +++ b/cpp/test/Ice/checksum/server/Makefile.mak @@ -33,6 +33,7 @@ $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/custom/Makefile.mak b/cpp/test/Ice/custom/Makefile.mak index 9ea0f075295..8f2570dffda 100644 --- a/cpp/test/Ice/custom/Makefile.mak +++ b/cpp/test/Ice/custom/Makefile.mak @@ -72,21 +72,25 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(SERVERAMD): $(SAMDOBJS) $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVERAMD).manifest \ mt -nologo -manifest $(SERVERAMD).manifest -outputresource:$(SERVERAMD);#1 & del /q $(SERVERAMD).manifest + -if exist $(SERVERAMD:.exe=.exp) del /q $(SERVERAMD:.exe=.exp) $(COLLOCATED): $(COLOBJS) $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(COLLOCATED).manifest \ mt -nologo -manifest $(COLLOCATED).manifest -outputresource:$(COLLOCATED);#1 & del /q $(COLLOCATED).manifest + -if exist $(COLLOCATED:.exe=.exp) del /q $(COLLOCATED:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/exceptions/Makefile.mak b/cpp/test/Ice/exceptions/Makefile.mak index ab0d4c95696..40fa16250ef 100644 --- a/cpp/test/Ice/exceptions/Makefile.mak +++ b/cpp/test/Ice/exceptions/Makefile.mak @@ -53,21 +53,25 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(SERVERAMD): $(SAMDOBJS) $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVERAMD).manifest \ mt -nologo -manifest $(SERVERAMD).manifest -outputresource:$(SERVERAMD);#1 & del /q $(SERVERAMD).manifest + -if exist $(SERVERAMD:.exe=.exp) del /q $(SERVERAMD:.exe=.exp) $(COLLOCATED): $(COLOBJS) $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(COLLOCATED).manifest \ mt -nologo -manifest $(COLLOCATED).manifest -outputresource:$(COLLOCATED);#1 & del /q $(COLLOCATED).manifest + -if exist $(COLLOCATED:.exe=.exp) del /q $(COLLOCATED:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/facets/Makefile.mak b/cpp/test/Ice/facets/Makefile.mak index de47f7d7df7..8e2e55bb642 100644 --- a/cpp/test/Ice/facets/Makefile.mak +++ b/cpp/test/Ice/facets/Makefile.mak @@ -46,16 +46,19 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(COLLOCATED): $(COLOBJS) $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(COLLOCATED).manifest \ mt -nologo -manifest $(COLLOCATED).manifest -outputresource:$(COLLOCATED);#1 & del /q $(COLLOCATED).manifest + -if exist $(COLLOCATED:.exe=.exp) del /q $(COLLOCATED:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/faultTolerance/Makefile.mak b/cpp/test/Ice/faultTolerance/Makefile.mak index 36fa46f4575..14774fadaee 100644 --- a/cpp/test/Ice/faultTolerance/Makefile.mak +++ b/cpp/test/Ice/faultTolerance/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/gc/Makefile.mak b/cpp/test/Ice/gc/Makefile.mak index 7c591c0ea1d..b8ecda6bb6d 100644 --- a/cpp/test/Ice/gc/Makefile.mak +++ b/cpp/test/Ice/gc/Makefile.mak @@ -30,6 +30,7 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/hold/Makefile.mak b/cpp/test/Ice/hold/Makefile.mak index 36fa46f4575..14774fadaee 100644 --- a/cpp/test/Ice/hold/Makefile.mak +++ b/cpp/test/Ice/hold/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/inheritance/Makefile.mak b/cpp/test/Ice/inheritance/Makefile.mak index de47f7d7df7..8e2e55bb642 100644 --- a/cpp/test/Ice/inheritance/Makefile.mak +++ b/cpp/test/Ice/inheritance/Makefile.mak @@ -46,16 +46,19 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(COLLOCATED): $(COLOBJS) $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(COLLOCATED).manifest \ mt -nologo -manifest $(COLLOCATED).manifest -outputresource:$(COLLOCATED);#1 & del /q $(COLLOCATED).manifest + -if exist $(COLLOCATED:.exe=.exp) del /q $(COLLOCATED:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/location/Makefile.mak b/cpp/test/Ice/location/Makefile.mak index 03656a5e3b3..13fcd0c5797 100644 --- a/cpp/test/Ice/location/Makefile.mak +++ b/cpp/test/Ice/location/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/objects/Makefile.mak b/cpp/test/Ice/objects/Makefile.mak index 700ff7bb090..a1149bf9ff0 100644 --- a/cpp/test/Ice/objects/Makefile.mak +++ b/cpp/test/Ice/objects/Makefile.mak @@ -48,16 +48,19 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(COLLOCATED): $(COLOBJS) $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(COLLOCATED).manifest \ mt -nologo -manifest $(COLLOCATED).manifest -outputresource:$(COLLOCATED);#1 & del /q $(COLLOCATED).manifest + -if exist $(COLLOCATED:.exe=.exp) del /q $(COLLOCATED:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/operations/Makefile.mak b/cpp/test/Ice/operations/Makefile.mak index 64472f8ea47..5ca9b597fe2 100644 --- a/cpp/test/Ice/operations/Makefile.mak +++ b/cpp/test/Ice/operations/Makefile.mak @@ -59,21 +59,25 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(SERVERAMD): $(SAMDOBJS) $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVERAMD).manifest \ mt -nologo -manifest $(SERVERAMD).manifest -outputresource:$(SERVERAMD);#1 & del /q $(SERVERAMD).manifest + -if exist $(SERVERAMD:.exe=.exp) del /q $(SERVERAMD:.exe=.exp) $(COLLOCATED): $(COLOBJS) $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(COLLOCATED).manifest \ mt -nologo -manifest $(COLLOCATED).manifest -outputresource:$(COLLOCATED);#1 & del /q $(COLLOCATED).manifest + -if exist $(COLLOCATED:.exe=.exp) del /q $(COLLOCATED:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/retry/Makefile.mak b/cpp/test/Ice/retry/Makefile.mak index 36fa46f4575..14774fadaee 100644 --- a/cpp/test/Ice/retry/Makefile.mak +++ b/cpp/test/Ice/retry/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/servantLocator/Makefile.mak b/cpp/test/Ice/servantLocator/Makefile.mak index f54c67b75d8..db73bcfa5b6 100644 --- a/cpp/test/Ice/servantLocator/Makefile.mak +++ b/cpp/test/Ice/servantLocator/Makefile.mak @@ -55,21 +55,25 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(SERVERAMD): $(SAMDOBJS) $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVERAMD).manifest \ mt -nologo -manifest $(SERVERAMD).manifest -outputresource:$(SERVERAMD);#1 & del /q $(SERVERAMD).manifest + -if exist $(SERVERAMD:.exe=.exp) del /q $(SERVERAMD:.exe=.exp) $(COLLOCATED): $(COLOBJS) $(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(COLLOCATED).manifest \ mt -nologo -manifest $(COLLOCATED).manifest -outputresource:$(COLLOCATED);#1 & del /q $(COLLOCATED).manifest + -if exist $(COLLOCATED:.exe=.exp) del /q $(COLLOCATED:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mak b/cpp/test/Ice/slicing/exceptions/Makefile.mak index 4b0fa6bf59b..7dd2a8a3736 100644 --- a/cpp/test/Ice/slicing/exceptions/Makefile.mak +++ b/cpp/test/Ice/slicing/exceptions/Makefile.mak @@ -49,16 +49,19 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(SERVERAMD): $(SAMDOBJS) $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVERAMD).manifest \ mt -nologo -manifest $(SERVERAMD).manifest -outputresource:$(SERVERAMD);#1 & del /q $(SERVERAMD).manifest + -if exist $(SERVERAMD:.exe=.exp) del /q $(SERVERAMD:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/slicing/objects/Makefile.mak b/cpp/test/Ice/slicing/objects/Makefile.mak index fe84b3decb3..79dbcb410c9 100644 --- a/cpp/test/Ice/slicing/objects/Makefile.mak +++ b/cpp/test/Ice/slicing/objects/Makefile.mak @@ -53,16 +53,19 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(SERVERAMD): $(SAMDOBJS) $(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVERAMD).manifest \ mt -nologo -manifest $(SERVERAMD).manifest -outputresource:$(SERVERAMD);#1 & del /q $(SERVERAMD).manifest + -if exist $(SERVERAMD:.exe=.exp) del /q $(SERVERAMD:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/stream/Makefile.mak b/cpp/test/Ice/stream/Makefile.mak index 76f4c841546..d006e5a9fe4 100644 --- a/cpp/test/Ice/stream/Makefile.mak +++ b/cpp/test/Ice/stream/Makefile.mak @@ -31,6 +31,7 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/threads/Makefile.mak b/cpp/test/Ice/threads/Makefile.mak index 36fa46f4575..14774fadaee 100644 --- a/cpp/test/Ice/threads/Makefile.mak +++ b/cpp/test/Ice/threads/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/Ice/timeout/Makefile.mak b/cpp/test/Ice/timeout/Makefile.mak index 36fa46f4575..14774fadaee 100644 --- a/cpp/test/Ice/timeout/Makefile.mak +++ b/cpp/test/Ice/timeout/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/IceGrid/activation/Makefile.mak b/cpp/test/IceGrid/activation/Makefile.mak index 0b202bd9ec3..e7b61f3f20b 100644 --- a/cpp/test/IceGrid/activation/Makefile.mak +++ b/cpp/test/IceGrid/activation/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/IceGrid/allocation/Makefile.mak b/cpp/test/IceGrid/allocation/Makefile.mak index 042109fd733..7f9267d5116 100644 --- a/cpp/test/IceGrid/allocation/Makefile.mak +++ b/cpp/test/IceGrid/allocation/Makefile.mak @@ -44,16 +44,19 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) $(VERIFIER): $(VOBJS) $(LINK) $(LD_EXEFLAGS) $(VPDBFLAGS) $(VOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(VERIFIER).manifest \ mt -nologo -manifest $(VERIFIER).manifest -outputresource:$(VERIFIER);#1 & del /q $(VERIFIER).manifest + -if exist $(VERIFIER:.exe=.exp) del /q $(VERIFIER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/IceGrid/deployer/Makefile.mak b/cpp/test/IceGrid/deployer/Makefile.mak index d126f2dc5a7..e0201aecabe 100644 --- a/cpp/test/IceGrid/deployer/Makefile.mak +++ b/cpp/test/IceGrid/deployer/Makefile.mak @@ -51,17 +51,20 @@ $(DLLNAME): $(OBJS) $(SERVICE_OBJS) freeze$(LIBSUFFIX).lib -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \ icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/IceGrid/distribution/Makefile.mak b/cpp/test/IceGrid/distribution/Makefile.mak index a285f12b736..f92834586f8 100644 --- a/cpp/test/IceGrid/distribution/Makefile.mak +++ b/cpp/test/IceGrid/distribution/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/IceGrid/replicaGroup/Makefile.mak b/cpp/test/IceGrid/replicaGroup/Makefile.mak index d126f2dc5a7..e0201aecabe 100644 --- a/cpp/test/IceGrid/replicaGroup/Makefile.mak +++ b/cpp/test/IceGrid/replicaGroup/Makefile.mak @@ -51,17 +51,20 @@ $(DLLNAME): $(OBJS) $(SERVICE_OBJS) freeze$(LIBSUFFIX).lib -if exist $(DLLNAME).manifest \ mt -nologo -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2 & del /q $(DLLNAME).manifest + -if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(CLIENT): $(OBJS) $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) \ icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/IceGrid/replication/Makefile.mak b/cpp/test/IceGrid/replication/Makefile.mak index 7f49dbd1f6a..a36ca0beaf9 100644 --- a/cpp/test/IceGrid/replication/Makefile.mak +++ b/cpp/test/IceGrid/replication/Makefile.mak @@ -32,7 +32,6 @@ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN LINKWITH = $(LIBS) icebox$(LIBSUFFIX).lib !if "$(CPP_COMPILER)" != "BCC2006" & "$(OPTIMIZE)" != "yes" -PDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb) !endif @@ -42,11 +41,13 @@ $(CLIENT): $(OBJS) $(COBJS) icegrid$(LIBSUFFIX).lib glacier2$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/IceGrid/session/Makefile.mak b/cpp/test/IceGrid/session/Makefile.mak index a9bf507fcc9..2ac691e7a69 100644 --- a/cpp/test/IceGrid/session/Makefile.mak +++ b/cpp/test/IceGrid/session/Makefile.mak @@ -41,15 +41,18 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icegrid$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(VERIFIER): $(VOBJS) $(LINK) $(LD_EXEFLAGS) $(VPDBFLAGS) $(VOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(VERIFIER).manifest \ mt -nologo -manifest $(VERIFIER).manifest -outputresource:$(VERIFIER);#1 & del /q $(VERIFIER).manifest + -if exist $(VERIFIER:.exe=.exp) del /q $(VERIFIER:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) icessl$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) !include .depend diff --git a/cpp/test/IceGrid/simple/Makefile.mak b/cpp/test/IceGrid/simple/Makefile.mak index 0b202bd9ec3..e7b61f3f20b 100644 --- a/cpp/test/IceGrid/simple/Makefile.mak +++ b/cpp/test/IceGrid/simple/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/IceGrid/update/Makefile.mak b/cpp/test/IceGrid/update/Makefile.mak index 0b202bd9ec3..e7b61f3f20b 100644 --- a/cpp/test/IceGrid/update/Makefile.mak +++ b/cpp/test/IceGrid/update/Makefile.mak @@ -39,11 +39,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/IceSSL/configuration/Makefile.mak b/cpp/test/IceSSL/configuration/Makefile.mak index 522bfe4a6d6..d85d5af6d21 100644 --- a/cpp/test/IceSSL/configuration/Makefile.mak +++ b/cpp/test/IceSSL/configuration/Makefile.mak @@ -38,11 +38,13 @@ $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icessl$(LIBSUFFIX).lib -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) $(SERVER): $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icessl$(LIBSUFFIX).lib -if exist $(SERVER).manifest \ mt -nologo -manifest $(SERVER).manifest -outputresource:$(SERVER);#1 & del /q $(SERVER).manifest + -if exist $(SERVER:.exe=.exp) del /q $(SERVER:.exe=.exp) clean:: del /q Test.cpp Test.h diff --git a/cpp/test/IceStorm/federation/Makefile.mak b/cpp/test/IceStorm/federation/Makefile.mak index 643856e2865..f8a6bd44a11 100644 --- a/cpp/test/IceStorm/federation/Makefile.mak +++ b/cpp/test/IceStorm/federation/Makefile.mak @@ -39,11 +39,13 @@ $(PUBLISHER): $(OBJS) $(POBJS) $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(PUBLISHER).manifest \ mt -nologo -manifest $(PUBLISHER).manifest -outputresource:$(PUBLISHER);#1 & del /q $(PUBLISHER).manifest + -if exist $(PUBLISHER:.exe=.exp) del /q $(PUBLISHER:.exe=.exp) $(SUBSCRIBER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SUBSCRIBER).manifest \ mt -nologo -manifest $(SUBSCRIBER).manifest -outputresource:$(SUBSCRIBER);#1 & del /q $(SUBSCRIBER).manifest + -if exist $(SUBSCRIBER:.exe=.exp) del /q $(SUBSCRIBER:.exe=.exp) clean:: del /q Event.cpp Event.h diff --git a/cpp/test/IceStorm/federation2/Makefile.mak b/cpp/test/IceStorm/federation2/Makefile.mak index 643856e2865..f8a6bd44a11 100644 --- a/cpp/test/IceStorm/federation2/Makefile.mak +++ b/cpp/test/IceStorm/federation2/Makefile.mak @@ -39,11 +39,13 @@ $(PUBLISHER): $(OBJS) $(POBJS) $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(PUBLISHER).manifest \ mt -nologo -manifest $(PUBLISHER).manifest -outputresource:$(PUBLISHER);#1 & del /q $(PUBLISHER).manifest + -if exist $(PUBLISHER:.exe=.exp) del /q $(PUBLISHER:.exe=.exp) $(SUBSCRIBER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SUBSCRIBER).manifest \ mt -nologo -manifest $(SUBSCRIBER).manifest -outputresource:$(SUBSCRIBER);#1 & del /q $(SUBSCRIBER).manifest + -if exist $(SUBSCRIBER:.exe=.exp) del /q $(SUBSCRIBER:.exe=.exp) clean:: del /q Event.cpp Event.h diff --git a/cpp/test/IceStorm/single/Makefile.mak b/cpp/test/IceStorm/single/Makefile.mak index 2fee8f34847..0f2ab62e980 100644 --- a/cpp/test/IceStorm/single/Makefile.mak +++ b/cpp/test/IceStorm/single/Makefile.mak @@ -39,11 +39,13 @@ $(PUBLISHER): $(OBJS) $(POBJS) $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(PUBLISHER).manifest \ mt -nologo -manifest $(PUBLISHER).manifest -outputresource:$(PUBLISHER);#1 & del /q $(PUBLISHER).manifest + -if exist $(PUBLISHER:.exe=.exp) del /q $(PUBLISHER:.exe=.exp) $(SUBSCRIBER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SUBSCRIBER).manifest \ mt -nologo -manifest $(SUBSCRIBER).manifest -outputresource:$(SUBSCRIBER);#1 & del /q $(SUBSCRIBER).manifest + -if exist $(SUBSCRIBER:.exe=.exp) del /q $(SUBSCRIBER:.exe=.exp) clean:: del /q Single.cpp Single.h diff --git a/cpp/test/IceStorm/stress/Makefile.mak b/cpp/test/IceStorm/stress/Makefile.mak index 643856e2865..f8a6bd44a11 100644 --- a/cpp/test/IceStorm/stress/Makefile.mak +++ b/cpp/test/IceStorm/stress/Makefile.mak @@ -39,11 +39,13 @@ $(PUBLISHER): $(OBJS) $(POBJS) $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(OBJS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(PUBLISHER).manifest \ mt -nologo -manifest $(PUBLISHER).manifest -outputresource:$(PUBLISHER);#1 & del /q $(PUBLISHER).manifest + -if exist $(PUBLISHER:.exe=.exp) del /q $(PUBLISHER:.exe=.exp) $(SUBSCRIBER): $(OBJS) $(SOBJS) $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) -if exist $(SUBSCRIBER).manifest \ mt -nologo -manifest $(SUBSCRIBER).manifest -outputresource:$(SUBSCRIBER);#1 & del /q $(SUBSCRIBER).manifest + -if exist $(SUBSCRIBER:.exe=.exp) del /q $(SUBSCRIBER:.exe=.exp) clean:: del /q Event.cpp Event.h diff --git a/cpp/test/IceUtil/ctrlCHandler/Makefile.mak b/cpp/test/IceUtil/ctrlCHandler/Makefile.mak index 75d41bee7c0..69a19d2e57b 100644 --- a/cpp/test/IceUtil/ctrlCHandler/Makefile.mak +++ b/cpp/test/IceUtil/ctrlCHandler/Makefile.mak @@ -29,5 +29,6 @@ $(CLIENT): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) !include .depend diff --git a/cpp/test/IceUtil/inputUtil/Makefile.mak b/cpp/test/IceUtil/inputUtil/Makefile.mak index 75d41bee7c0..69a19d2e57b 100644 --- a/cpp/test/IceUtil/inputUtil/Makefile.mak +++ b/cpp/test/IceUtil/inputUtil/Makefile.mak @@ -29,5 +29,6 @@ $(CLIENT): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) !include .depend diff --git a/cpp/test/IceUtil/thread/Makefile.mak b/cpp/test/IceUtil/thread/Makefile.mak index 482ff9aff11..fb38a1fbb75 100644 --- a/cpp/test/IceUtil/thread/Makefile.mak +++ b/cpp/test/IceUtil/thread/Makefile.mak @@ -41,5 +41,6 @@ $(CLIENT): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) !include .depend diff --git a/cpp/test/IceUtil/unicode/Makefile.mak b/cpp/test/IceUtil/unicode/Makefile.mak index 75d41bee7c0..69a19d2e57b 100644 --- a/cpp/test/IceUtil/unicode/Makefile.mak +++ b/cpp/test/IceUtil/unicode/Makefile.mak @@ -29,5 +29,6 @@ $(CLIENT): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) !include .depend diff --git a/cpp/test/IceUtil/uuid/Makefile.mak b/cpp/test/IceUtil/uuid/Makefile.mak index 75d41bee7c0..69a19d2e57b 100644 --- a/cpp/test/IceUtil/uuid/Makefile.mak +++ b/cpp/test/IceUtil/uuid/Makefile.mak @@ -29,5 +29,6 @@ $(CLIENT): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) -if exist $(CLIENT).manifest \ mt -nologo -manifest $(CLIENT).manifest -outputresource:$(CLIENT);#1 & del /q $(CLIENT).manifest + -if exist $(CLIENT:.exe=.exp) del /q $(CLIENT:.exe=.exp) !include .depend |