diff options
| author | Sam Steingold | 2001-01-17 16:18:45 +0000 |
|---|---|---|
| committer | Sam Steingold | 2001-01-17 16:18:45 +0000 |
| commit | d51ffa0ebe086994903f6ff18628b9897bc09028 (patch) | |
| tree | 5b370b0641951f930a16de459597bd944f52cda2 /src | |
| parent | a86110a8e3be545fd163ed1d9f7fa08cffa1a616 (diff) | |
| download | emacs-d51ffa0ebe086994903f6ff18628b9897bc09028.tar.gz emacs-d51ffa0ebe086994903f6ff18628b9897bc09028.zip | |
removed x-list-font.c per change 2001-01-17 Gerd Moellmann <gerd@gnu.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.nt | 21 | ||||
| -rw-r--r-- | src/makefile.w32-in | 15 |
2 files changed, 17 insertions, 19 deletions
diff --git a/src/makefile.nt b/src/makefile.nt index 16264d7da85..fbd2838b87b 100644 --- a/src/makefile.nt +++ b/src/makefile.nt | |||
| @@ -4,24 +4,24 @@ | |||
| 4 | # Geoff Voelker (voelker@cs.washington.edu) 11-20-93 | 4 | # Geoff Voelker (voelker@cs.washington.edu) 11-20-93 |
| 5 | # | 5 | # |
| 6 | # This file is part of GNU Emacs. | 6 | # This file is part of GNU Emacs. |
| 7 | # | 7 | # |
| 8 | # GNU Emacs is free software; you can redistribute it and/or modify | 8 | # GNU Emacs is free software; you can redistribute it and/or modify |
| 9 | # it under the terms of the GNU General Public License as published by | 9 | # it under the terms of the GNU General Public License as published by |
| 10 | # the Free Software Foundation; either version 2, or (at your option) | 10 | # the Free Software Foundation; either version 2, or (at your option) |
| 11 | # any later version. | 11 | # any later version. |
| 12 | # | 12 | # |
| 13 | # GNU Emacs is distributed in the hope that it will be useful, | 13 | # GNU Emacs is distributed in the hope that it will be useful, |
| 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 16 | # GNU General Public License for more details. | 16 | # GNU General Public License for more details. |
| 17 | # | 17 | # |
| 18 | # You should have received a copy of the GNU General Public License | 18 | # You should have received a copy of the GNU General Public License |
| 19 | # along with GNU Emacs; see the file COPYING. If not, write to the | 19 | # along with GNU Emacs; see the file COPYING. If not, write to the |
| 20 | # Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 20 | # Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| 21 | # Boston, MA 02111-1307, USA. | 21 | # Boston, MA 02111-1307, USA. |
| 22 | # | 22 | # |
| 23 | 23 | ||
| 24 | # | 24 | # |
| 25 | # Sets up the system dependent macros. | 25 | # Sets up the system dependent macros. |
| 26 | # | 26 | # |
| 27 | !include ..\nt\makefile.def | 27 | !include ..\nt\makefile.def |
| @@ -187,7 +187,7 @@ LIBS = $(TLIB0) \ | |||
| 187 | # | 187 | # |
| 188 | # Build the executable and dump it. | 188 | # Build the executable and dump it. |
| 189 | # | 189 | # |
| 190 | all: $(BLD) $(EMACS) | 190 | all: $(BLD) $(EMACS) |
| 191 | 191 | ||
| 192 | # | 192 | # |
| 193 | # Headers we would preprocess if we could. | 193 | # Headers we would preprocess if we could. |
| @@ -202,7 +202,7 @@ epaths.h: ..\nt\paths.h | |||
| 202 | # Make sure we have the DOC file in the right place. | 202 | # Make sure we have the DOC file in the right place. |
| 203 | # | 203 | # |
| 204 | DOC = $(OBJDIR)\etc\DOC-X | 204 | DOC = $(OBJDIR)\etc\DOC-X |
| 205 | $(DOC):; cd ..\lib-src | 205 | $(DOC):; cd ..\lib-src |
| 206 | - $(DEL) DOC-X | 206 | - $(DEL) DOC-X |
| 207 | $(MAKE) $(MFLAGS) -f makefile.nt all | 207 | $(MAKE) $(MFLAGS) -f makefile.nt all |
| 208 | cd ..\src | 208 | cd ..\src |
| @@ -235,7 +235,7 @@ bootstrap-temacs: bootstrap-clean | |||
| 235 | $(MAKE) $(MFLAGS) -f makefile.nt temacs CFLAGS="$(CFLAGS) -DPURESIZE=5000000" | 235 | $(MAKE) $(MFLAGS) -f makefile.nt temacs CFLAGS="$(CFLAGS) -DPURESIZE=5000000" |
| 236 | 236 | ||
| 237 | # | 237 | # |
| 238 | # Dump an Emacs executable named bootstrap-emacs containing the | 238 | # Dump an Emacs executable named bootstrap-emacs containing the |
| 239 | # files from loadup.el in source form. | 239 | # files from loadup.el in source form. |
| 240 | # | 240 | # |
| 241 | bootstrap-emacs: bootstrap-temacs | 241 | bootstrap-emacs: bootstrap-temacs |
| @@ -264,7 +264,7 @@ $(TRES): ..\nt\emacs.rc | |||
| 264 | !endif | 264 | !endif |
| 265 | 265 | ||
| 266 | # | 266 | # |
| 267 | # Build the library. Split up the build into two phases...otherwise we | 267 | # Build the library. Split up the build into two phases...otherwise we |
| 268 | # run out of command line space. | 268 | # run out of command line space. |
| 269 | # | 269 | # |
| 270 | $(TLIB0): $(OBJ0) | 270 | $(TLIB0): $(OBJ0) |
| @@ -295,7 +295,7 @@ install: all | |||
| 295 | 295 | ||
| 296 | # | 296 | # |
| 297 | # Maintenance | 297 | # Maintenance |
| 298 | # | 298 | # |
| 299 | clean:; - $(DEL) *~ s\*~ | 299 | clean:; - $(DEL) *~ s\*~ |
| 300 | - $(DEL) *.pdb config.h epaths.h | 300 | - $(DEL) *.pdb config.h epaths.h |
| 301 | - $(DEL) *.orig *.rej *.crlf | 301 | - $(DEL) *.orig *.rej *.crlf |
| @@ -1088,7 +1088,7 @@ $(BLD)\vm-limit.obj : \ | |||
| 1088 | $(EMACS_ROOT)\src\s\ms-w32.h \ | 1088 | $(EMACS_ROOT)\src\s\ms-w32.h \ |
| 1089 | $(EMACS_ROOT)\src\m\intel386.h \ | 1089 | $(EMACS_ROOT)\src\m\intel386.h \ |
| 1090 | $(EMACS_ROOT)\src\config.h \ | 1090 | $(EMACS_ROOT)\src\config.h \ |
| 1091 | $(SRC)\mem-limits.h | 1091 | $(SRC)\mem-limits.h |
| 1092 | 1092 | ||
| 1093 | $(BLD)\widget.obj : \ | 1093 | $(BLD)\widget.obj : \ |
| 1094 | $(SRC)\widget.c \ | 1094 | $(SRC)\widget.c \ |
| @@ -1158,7 +1158,6 @@ $(BLD)\w32fns.obj: \ | |||
| 1158 | $(EMACS_ROOT)\src\m\intel386.h \ | 1158 | $(EMACS_ROOT)\src\m\intel386.h \ |
| 1159 | $(EMACS_ROOT)\src\config.h \ | 1159 | $(EMACS_ROOT)\src\config.h \ |
| 1160 | $(SRC)\w32fns.c \ | 1160 | $(SRC)\w32fns.c \ |
| 1161 | $(SRC)\x-list-font.c \ | ||
| 1162 | $(SRC)\w32term.h \ | 1161 | $(SRC)\w32term.h \ |
| 1163 | $(SRC)\w32gui.h \ | 1162 | $(SRC)\w32gui.h \ |
| 1164 | $(SRC)\frame.h \ | 1163 | $(SRC)\frame.h \ |
diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 9bd6cb53a9f..2b3747ad768 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in | |||
| @@ -2,17 +2,17 @@ | |||
| 2 | # Copyright (c) 1992-2000 Free Software Foundation, Inc. | 2 | # Copyright (c) 1992-2000 Free Software Foundation, Inc. |
| 3 | # | 3 | # |
| 4 | # This file is part of GNU Emacs. | 4 | # This file is part of GNU Emacs. |
| 5 | # | 5 | # |
| 6 | # GNU Emacs is free software; you can redistribute it and/or modify | 6 | # GNU Emacs is free software; you can redistribute it and/or modify |
| 7 | # it under the terms of the GNU General Public License as published by | 7 | # it under the terms of the GNU General Public License as published by |
| 8 | # the Free Software Foundation; either version 2, or (at your option) | 8 | # the Free Software Foundation; either version 2, or (at your option) |
| 9 | # any later version. | 9 | # any later version. |
| 10 | # | 10 | # |
| 11 | # GNU Emacs is distributed in the hope that it will be useful, | 11 | # GNU Emacs is distributed in the hope that it will be useful, |
| 12 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 14 | # GNU General Public License for more details. | 14 | # GNU General Public License for more details. |
| 15 | # | 15 | # |
| 16 | # You should have received a copy of the GNU General Public License | 16 | # You should have received a copy of the GNU General Public License |
| 17 | # along with GNU Emacs; see the file COPYING. If not, write to the | 17 | # along with GNU Emacs; see the file COPYING. If not, write to the |
| 18 | # Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | # Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| @@ -172,7 +172,7 @@ bootstrap-temacs: bootstrap-clean | |||
| 172 | $(MAKE) $(MFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=5000000$(ARGQUOTE) | 172 | $(MAKE) $(MFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=5000000$(ARGQUOTE) |
| 173 | 173 | ||
| 174 | # | 174 | # |
| 175 | # Dump an Emacs executable named bootstrap-emacs containing the | 175 | # Dump an Emacs executable named bootstrap-emacs containing the |
| 176 | # files from loadup.el in source form. | 176 | # files from loadup.el in source form. |
| 177 | # | 177 | # |
| 178 | bootstrap-emacs: bootstrap-temacs | 178 | bootstrap-emacs: bootstrap-temacs |
| @@ -198,7 +198,7 @@ $(TRES): ../nt/emacs.rc | |||
| 198 | $(RC) $(RC_INCLUDE)../nt $(RC_OUT)$@ $(ALL_DEPS) | 198 | $(RC) $(RC_INCLUDE)../nt $(RC_OUT)$@ $(ALL_DEPS) |
| 199 | 199 | ||
| 200 | # | 200 | # |
| 201 | # Build the library. Split up the build into two phases...otherwise we | 201 | # Build the library. Split up the build into two phases...otherwise we |
| 202 | # run out of command line space. | 202 | # run out of command line space. |
| 203 | # | 203 | # |
| 204 | $(TLIB0): $(OBJ0) | 204 | $(TLIB0): $(OBJ0) |
| @@ -229,7 +229,7 @@ install: $(ALL) | |||
| 229 | 229 | ||
| 230 | # | 230 | # |
| 231 | # Maintenance | 231 | # Maintenance |
| 232 | # | 232 | # |
| 233 | clean: | 233 | clean: |
| 234 | - $(DEL) *~ "s/*~" "m/*~" | 234 | - $(DEL) *~ "s/*~" "m/*~" |
| 235 | - $(DEL) $(COMPILER_TEMP_FILES) | 235 | - $(DEL) $(COMPILER_TEMP_FILES) |
| @@ -1017,7 +1017,7 @@ $(BLD)/vm-limit.$(O) : \ | |||
| 1017 | $(EMACS_ROOT)/src/s/ms-w32.h \ | 1017 | $(EMACS_ROOT)/src/s/ms-w32.h \ |
| 1018 | $(EMACS_ROOT)/src/m/intel386.h \ | 1018 | $(EMACS_ROOT)/src/m/intel386.h \ |
| 1019 | $(EMACS_ROOT)/src/config.h \ | 1019 | $(EMACS_ROOT)/src/config.h \ |
| 1020 | $(SRC)/mem-limits.h | 1020 | $(SRC)/mem-limits.h |
| 1021 | 1021 | ||
| 1022 | $(BLD)/widget.$(O) : \ | 1022 | $(BLD)/widget.$(O) : \ |
| 1023 | $(SRC)/widget.c \ | 1023 | $(SRC)/widget.c \ |
| @@ -1087,7 +1087,6 @@ $(BLD)/w32fns.$(O): \ | |||
| 1087 | $(EMACS_ROOT)/src/m/intel386.h \ | 1087 | $(EMACS_ROOT)/src/m/intel386.h \ |
| 1088 | $(EMACS_ROOT)/src/config.h \ | 1088 | $(EMACS_ROOT)/src/config.h \ |
| 1089 | $(SRC)/w32fns.c \ | 1089 | $(SRC)/w32fns.c \ |
| 1090 | $(SRC)/x-list-font.c \ | ||
| 1091 | $(SRC)/w32term.h \ | 1090 | $(SRC)/w32term.h \ |
| 1092 | $(SRC)/w32gui.h \ | 1091 | $(SRC)/w32gui.h \ |
| 1093 | $(SRC)/frame.h \ | 1092 | $(SRC)/frame.h \ |