From 13a83ff7d9d596c35e6ee3b3ece398f8b17abe85 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 2 Apr 2009 06:06:54 +0000 Subject: [PATCH] DEVEL15-windows-src-makefile-20090402 LICENSE MIT remove extraneous echo command output do not attempt to build NSIS target on non-x86 platforms since support is not implemented (cherry picked from commit 27aedf7a2cfb04f49b6b8f3c9cabc3d6cdb91c78) --- src/NTMakefile | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/NTMakefile b/src/NTMakefile index 86d231064..e6c97db72 100644 --- a/src/NTMakefile +++ b/src/NTMakefile @@ -601,24 +601,24 @@ netidmgr_plugin: xstat extra: netidmgr_plugin ! IF EXIST($(SRC)\WINNT\extra) && EXIST($(SRC)\WINNT\extra\NTMakefile) - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\WINNT\$@ $(CD) $(SRC)\WINNT\$@ $(NTMAKE) $(CD) ..\..\.. ! ELSE - echo ***** Skipping $@ ***** Not found. + @echo ***** Skipping $@ ***** Not found. ! ENDIF finale: extra - echo ***** $@ + @echo ***** $@ $(DOCD) $(SRC)\$@ $(CD) $(SRC)\$@ $(NTMAKE) $(CD) ..\.. install: finale - echo Build Finished Successfully + @echo Build Finished Successfully # Clean target for obj tree @@ -647,28 +647,33 @@ mkdir: -@copy $(SRC)\config\NTLANG.BAT . loopback: - echo ***** Making Loopback Adapter Utility DLL + @echo ***** Making Loopback Adapter Utility DLL $(DOCD) $(SRC)\WINNT\install\$@ $(CD) $(SRC)\WINNT\install\$@ $(NTMAKE) $(CD) ..\..\..\.. man-pages: - echo ***** $@ + @echo ***** $@ $(DOCD) $(DOC)\man-pages $(CD) $(DOC)\man-pages $(NTMAKE) $(CD) ..\.. -NSIS: loopback man-pages - echo ***** Making NSIS Installer +NSIS.i386: loopback man-pages + @echo ***** Making NSIS Installer $(DOCD) $(SRC)\WINNT\install\$@ $(CD) $(SRC)\WINNT\install\$@ $(NTMAKE) $(CD) ..\..\..\.. +NSIS.AMD64: + @echo Skipping NSIS Installer on non-x86 platforms; not implemented + +NSIS: NSIS.$(CPU) + wix: loopback man-pages - echo ***** Making Wix MSI Installer + @echo ***** Making Wix MSI Installer $(DOCD) $(SRC)\WINNT\install\$@ $(CD) $(SRC)\WINNT\install\$@ $(NTMAKE) -- 2.39.5