Remove files related to old msvc only windows build.

7 files changed, 6 insertions, 469 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index ba8bfce157d..73d4f6ee5d1 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,10 @@
 2004-05-03  Jason Rumney  <jasonr@gnu.org>
 
+        * makefile.nt, ebuild.bat, install.bat, fast-install.bat:
+        * makefile.def: Remove.
+
+        * nmake.defs (SYS_LDFLAGS): Add -nologo
+
         * makefile.w32-in (info-gmake, info-nmake): New targets.
         (info): Use them.
 
diff --git a/nt/ebuild.bat b/nt/ebuild.bat
deleted file mode 100755
index c7851779cc5..00000000000
--- a/nt/ebuild.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-if (%1) == () nmake -f makefile.nt all
-if not (%1) == () nmake -f makefile.nt %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-goto skipArchTag
-   arch-tag: f01be12a-fd17-448d-8275-c7f527c50a1f
-:skipArchTag
diff --git a/nt/fast-install.bat b/nt/fast-install.bat
deleted file mode 100755
index 11e969eb5a4..00000000000
--- a/nt/fast-install.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-nmake -f makefile.nt fast_install

-

-goto skipArchTag

-   arch-tag: 13c64379-e658-452f-92d3-90d0f230ca70

-:skipArchTag

diff --git a/nt/install.bat b/nt/install.bat
deleted file mode 100755
index 1074c03454b..00000000000
--- a/nt/install.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off

-if (%1) == (speed) set BUILD_TYPE=spd

-if (%1) == (speed) shift

-if not (%1) == () set INSTALL_DIR=%1

-if not (%1) == () shift

-nmake -f makefile.nt install %1 %2 %3 %4 %5 %6 %7 %8 %9

-set INSTALL_DIR=

-set BUILD_TYPE=

-

-goto skipArchTag

-   arch-tag: 1db5223b-8fc9-4bdb-8ad1-9e3962bf034a

-:skipArchTag

diff --git a/nt/makefile.def b/nt/makefile.def
deleted file mode 100644
index e5ca430cc39..00000000000
--- a/nt/makefile.def
+++ /dev/null
@@ -1,231 +0,0 @@
-#  -*- Makefile -*- definition file for building GNU Emacs on Windows NT
-#  Copyright (c) 1994-2001 Free Software Foundation, Inc.
-#
-#  GNU Emacs is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  GNU Emacs is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with GNU Emacs; see the file COPYING.  If not, write to
-#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-#     Geoff Voelker (voelker@cs.washington.edu)         9-6-94
-
-#
-# BEGIN CONFIGURATION
-#
-
-# Define the following to build the GUI version
-#
-NTGUI=1
-
-# Set INSTALL_DIR to be the directory into which you want emacs installed.
-#
-!ifndef INSTALL_DIR
-INSTALL_DIR     = C:\emacs
-!endif
-
-# Define MSVCNT11 to be nonzero if you are using the MSVCNT 1.1 environment.
-# MSVCNT11      = 1
-!ifndef MSVCNT11
-MSVCNT11        = 0
-!endif
-
-#
-# END CONFIGURATION
-#
-
-#
-# Allow detection of builds with MSVC 5 or later
-#
-_NMAKE_VER_5=162
-_NMAKE_VER_4=0
-
-!IFNDEF _NMAKE_VER
-_NMAKE_VER=$(_NMAKE_VER_4)
-!ENDIF
-
-# Check that the INCLUDE and LIB environment variables are set.
-#
-!ifndef INCLUDE
-!error The INCLUDE environment variable needs to be set.
-!endif
-!ifndef LIB
-!error The LIB environment variable needs to be set.
-!endif
-
-# Determine the architecture we're running on.
-# Define ARCH for our purposes;
-# Define CPU for use by ntwin32.mak;
-# Define CONFIG_H to the appropriate config.h for the system;
-#
-!ifdef PROCESSOR_ARCHITECTURE
-# We're on Windows NT
-CPU             = $(PROCESSOR_ARCHITECTURE)
-CONFIG_H        = config.nt
-OS_TYPE         = windowsnt
-! if "$(PROCESSOR_ARCHITECTURE)" == "x86"
-ARCH            = i386
-CPU             = i386
-! else
-!  if "$(PROCESSOR_ARCHITECTURE)" == "MIPS"
-ARCH            = mips
-!  else
-!   if "$(PROCESSOR_ARCHITECTURE)" == "ALPHA"
-ARCH            = alpha
-!   else
-!    if "$(PROCESSOR_ARCHITECTURE)" == "PPC"
-ARCH            = ppc
-!    else
-!error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)"
-!    endif
-!   endif
-!  endif
-! endif
-!else
-# We're on Windows 95
-ARCH            = i386
-CPU             = i386
-CONFIG_H        = config.nt
-OS_TYPE         = windows95
-!endif
-
-# Include ntwin32.mak.  So far, this file seems to be supported by every
-# Microsoft compiler on NT and Windows 95 and properly defines the executable
-# names and libraries necessary to build Emacs.  I do not have access
-# to any other vendor compilers, so I do not know if they supply this
-# file, too.  For now I'll assume that they do.
-#
-!include <ntwin32.mak>
-
-# Using cvtres is necessary on NT 3.10 and doesn't hurt on later platforms.
-CVTRES          = cvtres.exe
-AR              = $(implib)
-# The assignment $(CC) = $(cc) fails even though variables are case sensitive.
-LINK_TMP        = $(link)
-LINK            = $(LINK_TMP)
-CC_TMP          = $(cc)
-CC              = $(CC_TMP)
-
-# advapi32.lib is left off of $(baselibs) on NT 3.10
-!if "$(baselibs)" == "kernel32.lib "
-ADVAPI32        = advapi32.lib
-!else
-ADVAPI32        =
-!endif
-
-# Older ntwin32.mak files do not define libc; do it for them.
-!ifndef libc
-libc            = libc.lib
-!endif
-
-# The base libraries for compiling Emacs on NT.  With MSVC, this should
-# include oldnames.lib.
-!if $(MSVCNT11)
-BASE_LIBS       = $(libc) $(baselibs) oldnames.lib
-!else
-BASE_LIBS       = $(libc) $(baselibs) -nodefaultlib:oldnames.lib
-!endif
-
-# We want any debugging info in the executable.
-!if "$(LINK)" == "link32"
-SYS_LDFLAGS     = -nologo
-!else
-SYS_LDFLAGS     = -nologo -release -incremental:no -version:3.10
-!endif
-
-# Tag the executables to run out of the swapfile when execute off CD or network shares
-SYS_LDFLAGS = $(SYS_LDFLAGS) -swaprun:cd -swaprun:net
-
-INC             = -I.
-!if "$(BUILD_TYPE)" == "spd"
-CFLAGS_COMMON   = -nologo $(INC) $(ARCH_CFLAGS) $(LOCAL_FLAGS) -DWIN32_LEAN_AND_MEAN -D$(ARCH) -Fd$(BLD)\vc.pdb
-!else
-CFLAGS_COMMON   = -nologo $(INC) $(ARCH_CFLAGS) $(LOCAL_FLAGS) -DWIN32_LEAN_AND_MEAN -D$(ARCH) -Fd$(BLD)\vc.pdb -DEMACSDEBUG
-!endif
-!if $(MSVCNT11)
-CFLAGS          = $(CFLAGS_COMMON) -D_CRTAPI1=_cdecl
-!else
-CFLAGS          = $(CFLAGS_COMMON) -D_CRTAPI1=_cdecl
-!endif
-
-!ifdef BUILD_TYPE
-OBJDIR          = obj-$(BUILD_TYPE)
-!else
-OBJDIR          = obj
-!endif
-$(OBJDIR):;     -mkdir $(OBJDIR)
-BLD             = $(OBJDIR)\$(ARCH)
-$(BLD):         $(OBJDIR)
-                -mkdir $(BLD)
-
-CP              = copy
-CP_DIR          = xcopy /f/r/i/e/d/k
-
-!if "$(OS_TYPE)" == "windows95"
-DEL             = deltree /y
-DEL_TREE        = deltree /y
-!else
-DEL             = del
-# NT better way of killing a deltree
-DEL_TREE        = rd /s/q
-!endif
-
-# Lets us add icons to the GNU Emacs folder
-ADDPM           = ..\nt\$(BLD)\addpm.exe
-
-!if "$(ARCH)" == "i386"
-!if "$(BUILD_TYPE)" == "spd"
-ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -Oxsb2 -G6dF -Zi -Zp8
-!else
-ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -Od -G3d -Zi -Zp8
-!endif
-ARCH_LDFLAGS    = -align:0x1000 $(SYS_LDFLAGS)
-
-!else
-!if "$(ARCH)" == "mips"
-ARCH_CFLAGS     = -D_MIPS_=1 -c -W2 -Zi -Od -Gt0
-ARCH_LDFLAGS    = -align:0x1000 $(SYS_LDFLAGS)
-
-!else
-!if "$(ARCH)" == "alpha"
-!if "$(BUILD_TYPE)" == "spd"
-ARCH_CFLAGS     = -D_ALPHA_=1 -c -Ze -Zi -W2 -Od -D__stdcall= -D__cdecl=
-!else
-ARCH_CFLAGS     = -D_ALPHA_=1 -c -Ze -Zi -W2 -O1 -D__stdcall= -D__cdecl=
-!endif
-ARCH_LDFLAGS    = -align:0x2000 $(SYS_LDFLAGS)
-
-!else
-!if "$(ARCH)" == "ppc"
-# These flags are a guess...if they don't work, please send me mail.
-ARCH_CFLAGS     = -D_PPC_=1 -c -Ze -Zi -W2 -Od
-ARCH_LDFLAGS    = -align:0x1000 $(SYS_LDFLAGS)
-
-!else
-!ERROR Unknown architecture type "$(ARCH)".
-!endif
-!endif
-!endif
-!endif
-
-#
-# If the compiler supports compiling multiple .c files to .o files at
-# one time, use this feature.
-#
-!IF ("$(_NMAKE_VER)" == "$(_NMAKE_VER_4)")
-.c{$(BLD)}.obj:
-                $(CC) $(CFLAGS) -Fo$(BLD)\ $<
-!ELSE
-.c{$(BLD)}.obj::
-                $(CC) $(CFLAGS) -Fo$(BLD)\ $<
-!ENDIF
-
-# arch-tag: a8aa26d5-5f28-4263-b42a-6f91acb7d824
diff --git a/nt/makefile.nt b/nt/makefile.nt
deleted file mode 100644
index 43060e68fdd..00000000000
--- a/nt/makefile.nt
+++ /dev/null
@@ -1,213 +0,0 @@
-#  Top level -*- makefile -*- for building GNU Emacs on Windows NT
-#  Copyright (c) 1993-2000 Free Software Foundation, Inc.
-#
-#  This file is part of GNU Emacs.
-#
-#  GNU Emacs is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  GNU Emacs is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with GNU Emacs; see the file COPYING.  If not, write to
-#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#  Boston, MA 02111-1307, USA.
-#
-#   Geoff Voelker (voelker@cs.washington.edu)   11-20-93
-#                                                 9-6-94
-!include makefile.def
-
-ALL             = addpm ddeclient runemacs cmdproxy addsection preprep
-!if $(MSVCNT11)
-TRES            = $(BLD)\emacs.res
-!else
-TRES            = $(BLD)\emacs.rbj
-!endif
-
-addpm:            $(BLD) $(BLD)\addpm.exe
-$(BLD)\addpm.obj: addpm.c
-$(BLD)\addpm.exe: $(BLD)\addpm.obj
-                  $(LINK) -out:$@ -subsystem:console -entry:mainCRTStartup \
-                  $(SYS_LDFLAGS) $** $(BASE_LIBS) $(ADVAPI32) user32.lib
-
-ddeclient:        $(BLD) $(BLD)\ddeclient.exe
-$(BLD)\ddeclient.obj: ddeclient.c
-$(BLD)\ddeclient.exe: $(BLD)\ddeclient.obj
-                  $(LINK) -out:$@ -subsystem:console -entry:mainCRTStartup \
-                  $(SYS_LDFLAGS) $** $(BASE_LIBS) $(ADVAPI32) user32.lib
-
-cmdproxy:         $(BLD) $(BLD)\cmdproxy.exe
-$(BLD)\cmdproxy.obj: cmdproxy.c
-$(BLD)\cmdproxy.exe: $(BLD)\cmdproxy.obj
-                  $(LINK) -out:$@ -subsystem:console -entry:mainCRTStartup \
-                  $(SYS_LDFLAGS) $** $(BASE_LIBS) user32.lib
-
-addsection:       $(BLD) $(BLD)\addsection.exe
-$(BLD)\addsection.obj: addsection.c
-$(BLD)\addsection.exe: $(BLD)\addsection.obj
-                  $(LINK) -debug:full -out:$@ -subsystem:console -entry:mainCRTStartup \
-                  $(SYS_LDFLAGS) $** $(BASE_LIBS) user32.lib
-
-preprep:          $(BLD) $(BLD)\preprep.exe
-$(BLD)\preprep.obj: preprep.c
-$(BLD)\preprep.exe: $(BLD)\preprep.obj
-                  $(LINK) -debug:full -out:$@ -subsystem:console -entry:mainCRTStartup \
-                  $(SYS_LDFLAGS) $** $(BASE_LIBS)
-
-#
-# The resource file.  NT 3.10 requires the use of cvtres; even though
-# it is not necessary on later versions, it is still ok to use it.
-#
-$(TRES):        emacs.rc
-                $(RC) -Fo$(BLD)\emacs.res $**
-!if !$(MSVCNT11)
-                $(CVTRES) -r -$(ARCH) -o $@ $(BLD)\emacs.res
-!endif
-
-runemacs:         $(BLD) $(BLD)\runemacs.exe
-$(BLD)\runemacs.obj: runemacs.c
-$(BLD)\runemacs.exe: $(BLD)\runemacs.obj $(TRES)
-                  $(LINK) -out:$@ -subsystem:windows -entry:WinMainCRTStartup \
-                  $(SYS_LDFLAGS) $** $(BASE_LIBS) $(ADVAPI32) user32.lib
-
-# Since Windows 95 does not support multiple commands on one command line
-# (e.g., in for loops), we cannot use for loops any more.
-# SUBDIRS             = lib-src src lisp
-
-#
-# Build emacs
-#
-BUILD_CMD       = $(MAKE) $(MFLAGS) -f makefile.nt all
-all:            $(BLD) $(ALL)
-                cd ..\lib-src
-                $(BUILD_CMD)
-                cd ..\src
-                $(BUILD_CMD)
-                cd ..\lisp
-                $(BUILD_CMD)
-                cd ..\leim
-                if exist makefile.nt $(BUILD_CMD)
-                cd ..\nt
-
-BOOTSTRAP_CMD   = $(MAKE) $(MFLAGS) -f makefile.nt bootstrap
-bootstrap:      $(BLD) $(ALL)
-                cd ..\src
-                $(BOOTSTRAP_CMD)
-                $(BOOTCLEAN_CMD)
-                cd ..\lisp
-                $(BOOTSTRAP_CMD)
-                cd ..\nt
-
-BOOTCLEAN_CMD   = $(MAKE) $(MFLAGS) -f makefile.nt bootstrap-clean
-bootstrap-clean:
-                cd ..\src
-                $(BOOTCLEAN_CMD)
-                cd ..\lisp
-                $(BOOTCLEAN_CMD)
-
-$(INSTALL_DIR):
-                - mkdir $(INSTALL_DIR)
-
-$(INSTALL_DIR)\bin:
-                - mkdir $(INSTALL_DIR)\bin
-
-#
-# Build and install emacs in INSTALL_DIR
-#
-INSTALL_CMD     = $(MAKE) -f makefile.nt install
-install:        all $(INSTALL_DIR)
-                cd ..\lib-src
-                $(INSTALL_CMD)
-                cd ..\src
-                $(INSTALL_CMD)
-                cd ..\lisp
-                $(INSTALL_CMD)
-                cd ..\leim
-                if exist makefile.nt $(INSTALL_CMD)
-                cd ..\nt
-                - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
-                - $(CP) $(BLD)\ddeclient.exe $(INSTALL_DIR)\bin
-                - $(CP) $(BLD)\cmdproxy.exe $(INSTALL_DIR)\bin
-                - $(CP) $(BLD)\runemacs.exe $(INSTALL_DIR)\bin
-                - $(CP) ..\lib-src\fns-*.el $(INSTALL_DIR)\bin
-                - $(ADDPM) $(INSTALL_DIR)
-                - $(DEL) ..\same-dir.tst
-                - $(DEL) $(INSTALL_DIR)\same-dir.tst
-                - mkdir $(INSTALL_DIR)\etc\icons
-                - $(CP_DIR) icons $(INSTALL_DIR)\etc\icons
-                echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
-                if not exist ..\same-dir.tst $(MAKE) -f makefile.nt real_install
-                - $(DEL) ..\same-dir.tst
-                - $(DEL) $(INSTALL_DIR)\same-dir.tst
-
-#
-# This installs executables from ..\bin into the installation directory
-# without building anything.
-#
-fast_install:
-                - mkdir $(INSTALL_DIR)\data
-                $(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc
-                - mkdir $(INSTALL_DIR)\bin
-                - $(CP) $(BLD)\addpm.exe $(INSTALL_DIR)\bin
-                - $(CP) $(BLD)\ddeclient.exe $(INSTALL_DIR)\bin
-                - $(CP) $(BLD)\cmdproxy.exe $(INSTALL_DIR)\bin
-                - $(CP) $(BLD)\runemacs.exe $(INSTALL_DIR)\bin
-                - $(CP) ..\lib-src\fns-*.el $(INSTALL_DIR)\bin
-                - $(DEL) ..\same-dir.tst
-                - $(DEL) $(INSTALL_DIR)\same-dir.tst
-                echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
-                if not exist ..\same-dir.tst $(CP) ..\bin\emacs.exe $(INSTALL_DIR)\bin
-                if not exist ..\same-dir.tst $(CP) ..\bin\etags.exe $(INSTALL_DIR)\bin
-                if not exist ..\same-dir.tst $(CP) ..\bin\ctags.exe $(INSTALL_DIR)\bin
-                if not exist ..\same-dir.tst $(MAKE) -f makefile.nt real_install
-                - $(DEL) ..\same-dir.tst
-                - $(DEL) $(INSTALL_DIR)\same-dir.tst
-
-real_install:
-                - $(DEL) ..\same-dir.tst
-                - $(DEL) $(INSTALL_DIR)\same-dir.tst
-                echo SameDirTest > $(INSTALL_DIR)\same-dir.tst
-                - mkdir $(INSTALL_DIR)\etc
-                - mkdir $(INSTALL_DIR)\info
-                - mkdir $(INSTALL_DIR)\lock
-                - mkdir $(INSTALL_DIR)\data
-                - mkdir $(INSTALL_DIR)\site-lisp
-                - mkdir $(INSTALL_DIR)\etc\icons
-                - $(CP_DIR) icons $(INSTALL_DIR)\etc\icons
-                if not exist ..\same-dir.tst $(CP_DIR) ..\etc $(INSTALL_DIR)\etc
-                if not exist ..\same-dir.tst $(CP_DIR) ..\info $(INSTALL_DIR)\info
-                - $(DEL) ..\same-dir.tst
-                - $(DEL) $(INSTALL_DIR)\same-dir.tst
-
-#
-# Maintenance
-#
-CLEAN_CMD       = $(MAKE) -f makefile.nt clean
-clean:
-                - $(DEL) *~ *.pdb
-                - $(DEL) *.orig
-                - $(DEL) *.rej
-                - $(DEL) *.crlf
-                - $(DEL_TREE) deleted
-                - $(DEL_TREE) obj
-                - $(DEL_TREE) obj-spd
-                - $(DEL) ..\etc\DOC ..\etc\DOC-X
-                cd ..\lib-src
-                $(CLEAN_CMD)
-                cd ..\src
-                $(CLEAN_CMD)
-                cd ..\lisp
-                $(CLEAN_CMD)
-                cd ..\leim
-                if exist makefile.nt $(CLEAN_CMD)
-                cd ..\nt
-
-realclean: clean
-                - $(DEL_TREE) ..\bin
-
-# arch-tag: b01debf7-6859-439e-b08e-f041aa03c32f
diff --git a/nt/nmake.defs b/nt/nmake.defs
index f4239e1a415..b06dd64020f 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -134,7 +134,7 @@ CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 $(ARCH_CFLAGS)
                   -D_CRTAPI1=_cdecl $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)

 EMACS_EXTRA_C_FLAGS =

 

-SYS_LDFLAGS     = -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj

+SYS_LDFLAGS     = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj

 

 # see comments in allocate_heap in w32heap.c before changing any of the

 # -stack, -heap, or -base settings.