diff options
Diffstat (limited to 'cpp/src')
25 files changed, 72 insertions, 72 deletions
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak index 56f113e9679..def8df2f3fa 100644 --- a/cpp/src/Freeze/Makefile.mak +++ b/cpp/src/Freeze/Makefile.mak @@ -58,8 +58,8 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(HDIR)/Catalog.h Catalog.cpp: $(SLICE2FREEZE) $(SDIR)/CatalogData.ice diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak index 5c18064842a..6e72d3455e4 100644 --- a/cpp/src/FreezeScript/Makefile.mak +++ b/cpp/src/FreezeScript/Makefile.mak @@ -49,14 +49,14 @@ DPDBFLAGS = /pdb:$(DUMPDB:.exe=.pdb) $(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS) $(LINK) $(LD_EXEFLAGS) $(TPDBFLAGS) $(TRANSFORM_OBJS) $(COMMON_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest del /q $(TRANSFORMDB).manifest $(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS) $(LINK) $(LD_EXEFLAGS) $(DPDBFLAGS) $(DUMP_OBJS) $(COMMON_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest Scanner.cpp : Scanner.l flex Scanner.l diff --git a/cpp/src/Glacier2/Makefile.mak b/cpp/src/Glacier2/Makefile.mak index 0ea44da5355..f940bfb7bb0 100644 --- a/cpp/src/Glacier2/Makefile.mak +++ b/cpp/src/Glacier2/Makefile.mak @@ -76,14 +76,14 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(ROUTER): $(ROBJS) $(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(ROBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest !ifdef BUILD_UTILS diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index dd4c8c20b84..79760261c57 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -127,8 +127,8 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) $(RES_FILE) move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak index 224daded9a7..427ba0cca63 100644 --- a/cpp/src/IceBox/Makefile.mak +++ b/cpp/src/IceBox/Makefile.mak @@ -65,19 +65,19 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.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 $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(ADMIN): $(AOBJS) $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icebox$(LIBSUFFIX).lib - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest !ifdef BUILD_UTILS diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak index 4963a87153b..84c5bd338ab 100644 --- a/cpp/src/IceGrid/Makefile.mak +++ b/cpp/src/IceGrid/Makefile.mak @@ -155,19 +155,19 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(LIB_OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(LIB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.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 $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) &&\ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest $(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) $(LINK) $(LD_EXEFLAGS) $(RPDBFLAGS) $(REGISTRY_SVR_OBJS) $(PREOUT)$@ $(PRELIBS)$(NLINKWITH) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest del /q $(REGISTRY_SERVER).manifest $(NODE_SERVER): $(NODE_SVR_OBJS) diff --git a/cpp/src/IcePatch2/Makefile.mak b/cpp/src/IcePatch2/Makefile.mak index 9620a6f68d9..163bc9ac312 100644 --- a/cpp/src/IcePatch2/Makefile.mak +++ b/cpp/src/IcePatch2/Makefile.mak @@ -73,24 +73,24 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) $(BZIP2_LIBS) $(OPENSSL_LIBS) move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#2 && del /q $@.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 $@.manifest \ - $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest $(CLIENT): $(COBJS) $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icepatch2$(LIBSUFFIX).lib - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest $(CALC): $(CALCOBJS) $(LINK) $(LD_EXEFLAGS) $(CAPDBFLAGS) $(CALCOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icepatch2$(LIBSUFFIX).lib - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest security.manifest -outputresource:$@;#1 && del /q $@.manifest !ifdef BUILD_UTILS diff --git a/cpp/src/IceSSL/Makefile.mak b/cpp/src/IceSSL/Makefile.mak index 93c2eef7533..34ed52e1375 100644 --- a/cpp/src/IceSSL/Makefile.mak +++ b/cpp/src/IceSSL/Makefile.mak @@ -47,8 +47,8 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) clean:: diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak index e35a2708ec1..a2c5f78dc44 100644 --- a/cpp/src/IceStorm/Makefile.mak +++ b/cpp/src/IceStorm/Makefile.mak @@ -82,8 +82,8 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) $(SVCLIBNAME): $(SVCDLLNAME) @@ -91,14 +91,14 @@ $(SVCLIBNAME): $(SVCDLLNAME) $(SVCDLLNAME): $(SERVICE_OBJS) $(LINK) $(LD_DLLFLAGS) $(SPDBFLAGS) $(SERVICE_OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) move $(SVCDLLNAME:.dll=.lib) $(SVCLIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(SVCDLLNAME:.dll=.exp) del /q $(SVCDLLNAME:.dll=.exp) $(ADMIN): $(AOBJS) $(LINK) $(LD_EXEFLAGS) $(APDBFLAGS) $(AOBJS) $(PREOUT)$@ $(PRELIBS)$(ALINKWITH) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest ..\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 685662ee092..4d13a0582ed 100644 --- a/cpp/src/IceUtil/Makefile.mak +++ b/cpp/src/IceUtil/Makefile.mak @@ -53,8 +53,8 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(ICE_OS_LIBS) move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) clean:: diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak index d98a7079a4f..09c350d2347 100644 --- a/cpp/src/IceXML/Makefile.mak +++ b/cpp/src/IceXML/Makefile.mak @@ -33,8 +33,8 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) clean:: diff --git a/cpp/src/Slice/Makefile.mak b/cpp/src/Slice/Makefile.mak index c6c75f50d4a..55c59927157 100644 --- a/cpp/src/Slice/Makefile.mak +++ b/cpp/src/Slice/Makefile.mak @@ -42,8 +42,8 @@ $(LIBNAME): $(DLLNAME) $(DLLNAME): $(OBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(BASELIBS) move $(DLLNAME:.dll=.lib) $(LIBNAME) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest @if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp) Scanner.cpp : Scanner.l diff --git a/cpp/src/icecpp/Makefile.mak b/cpp/src/icecpp/Makefile.mak index c458eb7a048..c7c205a6715 100644 --- a/cpp/src/icecpp/Makefile.mak +++ b/cpp/src/icecpp/Makefile.mak @@ -37,8 +37,8 @@ prefix.obj: prefix.c $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest install:: all copy $(NAME) $(install_bindir) diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak index c1040daf0f9..8c6b0420c94 100644 --- a/cpp/src/slice2cpp/Makefile.mak +++ b/cpp/src/slice2cpp/Makefile.mak @@ -28,8 +28,8 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2cppe/Makefile.mak b/cpp/src/slice2cppe/Makefile.mak index 4aaed4dd285..db85026ad59 100644 --- a/cpp/src/slice2cppe/Makefile.mak +++ b/cpp/src/slice2cppe/Makefile.mak @@ -28,8 +28,8 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2cs/Makefile.mak b/cpp/src/slice2cs/Makefile.mak index d2bb26e56ef..5e461acf694 100644 --- a/cpp/src/slice2cs/Makefile.mak +++ b/cpp/src/slice2cs/Makefile.mak @@ -28,8 +28,8 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2docbook/Makefile.mak b/cpp/src/slice2docbook/Makefile.mak index 67bc4ac341c..02f3d401064 100644 --- a/cpp/src/slice2docbook/Makefile.mak +++ b/cpp/src/slice2docbook/Makefile.mak @@ -28,8 +28,8 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2freeze/Makefile.mak b/cpp/src/slice2freeze/Makefile.mak index 17be327a9d5..b4c09b03f10 100644 --- a/cpp/src/slice2freeze/Makefile.mak +++ b/cpp/src/slice2freeze/Makefile.mak @@ -23,8 +23,8 @@ CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2freezej/Makefile.mak b/cpp/src/slice2freezej/Makefile.mak index b28a163d0ec..ed35ca35159 100644 --- a/cpp/src/slice2freezej/Makefile.mak +++ b/cpp/src/slice2freezej/Makefile.mak @@ -27,8 +27,8 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2html/Makefile.mak b/cpp/src/slice2html/Makefile.mak index adb851d74b1..8e78a984480 100644 --- a/cpp/src/slice2html/Makefile.mak +++ b/cpp/src/slice2html/Makefile.mak @@ -28,8 +28,8 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2java/Makefile.mak b/cpp/src/slice2java/Makefile.mak index 03dcbb15c4d..a472c3cfd67 100644 --- a/cpp/src/slice2java/Makefile.mak +++ b/cpp/src/slice2java/Makefile.mak @@ -28,8 +28,8 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2javae/Makefile.mak b/cpp/src/slice2javae/Makefile.mak index 6728ca7b6da..81ff6fa9ac2 100644 --- a/cpp/src/slice2javae/Makefile.mak +++ b/cpp/src/slice2javae/Makefile.mak @@ -28,8 +28,8 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2py/Makefile.mak b/cpp/src/slice2py/Makefile.mak index 73ff7e13e60..4dd3bb034ca 100644 --- a/cpp/src/slice2py/Makefile.mak +++ b/cpp/src/slice2py/Makefile.mak @@ -27,8 +27,8 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2rb/Makefile.mak b/cpp/src/slice2rb/Makefile.mak index 04df12a2428..950cec54c6f 100755 --- a/cpp/src/slice2rb/Makefile.mak +++ b/cpp/src/slice2rb/Makefile.mak @@ -27,8 +27,8 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) diff --git a/cpp/src/slice2vb/Makefile.mak b/cpp/src/slice2vb/Makefile.mak index 91f711d3486..2dd11245648 100644 --- a/cpp/src/slice2vb/Makefile.mak +++ b/cpp/src/slice2vb/Makefile.mak @@ -28,8 +28,8 @@ PDBFLAGS = /pdb:$(NAME:.exe=.pdb) $(NAME): $(OBJS) $(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib $(BASELIBS) - @if exist $@.manifest \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 & del /q $@.manifest + @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ + $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest clean:: del /q $(NAME:.exe=.*) |