# HG changeset patch # User Sam Steingold # Date 979748325 0 # Node ID 2630c195f872b7fd59826250bfe27807e18f37c1 # Parent 7c46b0378534f7ea2260a542d27df941961b34c3 removed x-list-font.c per change 2001-01-17 Gerd Moellmann diff -r 7c46b0378534 -r 2630c195f872 src/makefile.nt --- a/src/makefile.nt Wed Jan 17 15:56:25 2001 +0000 +++ b/src/makefile.nt Wed Jan 17 16:18:45 2001 +0000 @@ -4,24 +4,24 @@ # Geoff Voelker (voelker@cs.washington.edu) 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 @@ # # Build the executable and dump it. # -all: $(BLD) $(EMACS) +all: $(BLD) $(EMACS) # # Headers we would preprocess if we could. @@ -202,7 +202,7 @@ # 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 @@ $(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 @@ !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 @@ # # Maintenance -# +# clean:; - $(DEL) *~ s\*~ - $(DEL) *.pdb config.h epaths.h - $(DEL) *.orig *.rej *.crlf @@ -1088,7 +1088,7 @@ $(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 @@ $(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 -r 7c46b0378534 -r 2630c195f872 src/makefile.w32-in --- a/src/makefile.w32-in Wed Jan 17 15:56:25 2001 +0000 +++ b/src/makefile.w32-in Wed Jan 17 16:18:45 2001 +0000 @@ -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 @@ $(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 @@ $(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 @@ # # Maintenance -# +# clean: - $(DEL) *~ "s/*~" "m/*~" - $(DEL) $(COMPILER_TEMP_FILES) @@ -1017,7 +1017,7 @@ $(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 @@ $(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 \