removed x-list-font.c per change 2001-01-17 Gerd Moellmann <[email protected]>

2 files changed, 17 insertions, 19 deletions

diff --git a/src/makefile.nt b/src/makefile.nt
index 16264d7da8..fbd2838b87 100644
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -4,24 +4,24 @@
 #   Geoff Voelker ([email protected])   11-20-93
 #
 #  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.
 #
 
-# 
+#
 # Sets up the system dependent macros.
 #
 !include ..\nt\makefile.def
@@ -187,7 +187,7 @@ LIBS =  $(TLIB0)	\
 #
 # Build the executable and dump it.
 #
-all:            $(BLD) $(EMACS) 
+all:            $(BLD) $(EMACS)
 
 #
 # Headers we would preprocess if we could.
@@ -202,7 +202,7 @@ epaths.h:	..\nt\paths.h
 # Make sure we have the DOC file in the right place.
 #
 DOC		= $(OBJDIR)\etc\DOC-X
-$(DOC):;	cd ..\lib-src 
+$(DOC):;	cd ..\lib-src
 		- $(DEL) DOC-X
 		$(MAKE) $(MFLAGS) -f makefile.nt all
 		cd ..\src
@@ -235,7 +235,7 @@ bootstrap-temacs: bootstrap-clean
 		$(MAKE) $(MFLAGS) -f makefile.nt temacs CFLAGS="$(CFLAGS) -DPURESIZE=5000000"
 
 #
-# Dump an Emacs executable named bootstrap-emacs containing the 
+# Dump an Emacs executable named bootstrap-emacs containing the
 # files from loadup.el in source form.
 #
 bootstrap-emacs: bootstrap-temacs
@@ -264,7 +264,7 @@ $(TRES):	..\nt\emacs.rc
 !endif
 
 #
-# Build the library.  Split up the build into two phases...otherwise we 
+# Build the library.  Split up the build into two phases...otherwise we
 # run out of command line space.
 #
 $(TLIB0):       $(OBJ0)
@@ -295,7 +295,7 @@ install:        all
 
 #
 # Maintenance
-# 
+#
 clean:;         - $(DEL) *~ s\*~
 		- $(DEL) *.pdb config.h epaths.h
 		- $(DEL) *.orig *.rej *.crlf
@@ -1088,7 +1088,7 @@ $(BLD)\vm-limit.obj : \
 	$(EMACS_ROOT)\src\s\ms-w32.h \
 	$(EMACS_ROOT)\src\m\intel386.h \
 	$(EMACS_ROOT)\src\config.h \
-	$(SRC)\mem-limits.h	
+	$(SRC)\mem-limits.h
 
 $(BLD)\widget.obj : \
 	$(SRC)\widget.c \
@@ -1158,7 +1158,6 @@ $(BLD)\w32fns.obj: \
 	$(EMACS_ROOT)\src\m\intel386.h \
 	$(EMACS_ROOT)\src\config.h \
 	$(SRC)\w32fns.c \
-	$(SRC)\x-list-font.c \
 	$(SRC)\w32term.h \
 	$(SRC)\w32gui.h \
 	$(SRC)\frame.h \
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 9bd6cb53a9..2b3747ad76 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -2,17 +2,17 @@
 #  Copyright (c) 1992-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,
@@ -172,7 +172,7 @@ bootstrap-temacs: bootstrap-clean
 	$(MAKE) $(MFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=5000000$(ARGQUOTE)
 
 #
-# Dump an Emacs executable named bootstrap-emacs containing the 
+# Dump an Emacs executable named bootstrap-emacs containing the
 # files from loadup.el in source form.
 #
 bootstrap-emacs: bootstrap-temacs
@@ -198,7 +198,7 @@ $(TRES): ../nt/emacs.rc
 	$(RC) $(RC_INCLUDE)../nt $(RC_OUT)$@ $(ALL_DEPS)
 
 #
-# Build the library.  Split up the build into two phases...otherwise we 
+# Build the library.  Split up the build into two phases...otherwise we
 # run out of command line space.
 #
 $(TLIB0):       $(OBJ0)
@@ -229,7 +229,7 @@ install:        $(ALL)
 
 #
 # Maintenance
-# 
+#
 clean:
 	- $(DEL) *~ "s/*~" "m/*~"
 	- $(DEL) $(COMPILER_TEMP_FILES)
@@ -1017,7 +1017,7 @@ $(BLD)/vm-limit.$(O) : \
 	$(EMACS_ROOT)/src/s/ms-w32.h \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
-	$(SRC)/mem-limits.h	
+	$(SRC)/mem-limits.h
 
 $(BLD)/widget.$(O) : \
 	$(SRC)/widget.c \
@@ -1087,7 +1087,6 @@ $(BLD)/w32fns.$(O): \
 	$(EMACS_ROOT)/src/m/intel386.h \
 	$(EMACS_ROOT)/src/config.h \
 	$(SRC)/w32fns.c \
-	$(SRC)/x-list-font.c \
 	$(SRC)/w32term.h \
 	$(SRC)/w32gui.h \
 	$(SRC)/frame.h \