comparison nt/xemacs.mak @ 406:b8cc9ab3f761 r21-2-33

Import from CVS: tag r21-2-33
author cvs
date Mon, 13 Aug 2007 11:17:09 +0200
parents 2f8bb876ab1d
children de805c49cfc1
comparison
equal deleted inserted replaced
405:0e08f63c74d2 406:b8cc9ab3f761
21 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 21 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22 # Boston, MA 02111-1307, USA. 22 # Boston, MA 02111-1307, USA.
23 # 23 #
24 # Synched up with: Not in FSF. 24 # Synched up with: Not in FSF.
25 # 25 #
26
27 default: all
26 28
27 XEMACS=.. 29 XEMACS=..
28 LISP=$(XEMACS)\lisp 30 LISP=$(XEMACS)\lisp
29 LIB_SRC=$(XEMACS)\lib-src 31 LIB_SRC=$(XEMACS)\lib-src
30 MODULES=$(XEMACS)\modules 32 MODULES=$(XEMACS)\modules
31 NT=$(XEMACS)\nt 33 NT=$(XEMACS)\nt
32 OUTDIR=$(NT)\obj 34 OUTDIR=$(NT)\obj
33 SRC=$(XEMACS)\src 35 SRC=$(XEMACS)\src
36 LWLIB_SRCDIR=$(XEMACS)\lwlib
34 MAKEDIRSTRING=$(MAKEDIR:\=\\) 37 MAKEDIRSTRING=$(MAKEDIR:\=\\)
35 XEMACSDIRSTRING=$(MAKEDIRSTRING:\\nt=) 38 XEMACSDIRSTRING=$(MAKEDIRSTRING:\\nt=)
36 39
37 40
38 # Define a variable for the 'del' command to use 41 # Define a variable for the 'del' command to use
39 DEL=-del 42 DEL=-del
40 43
41 # Program name and version 44 # Program name and version
42 45
43 !include "..\version.sh" 46 !include "$(XEMACS)\version.sh"
44 47
45 !include "config.inc" 48 !include "config.inc"
46 49
47 !if !defined(INFODOCK) 50 !if !defined(INFODOCK)
48 INFODOCK=0 51 INFODOCK=0
51 !if $(INFODOCK) 54 !if $(INFODOCK)
52 INFODOCK_VERSION_STRING=$(infodock_major_version).$(infodock_minor_version).$(infodock_build_version) 55 INFODOCK_VERSION_STRING=$(infodock_major_version).$(infodock_minor_version).$(infodock_build_version)
53 PROGRAM_DEFINES=-DINFODOCK \ 56 PROGRAM_DEFINES=-DINFODOCK \
54 -DPATH_VERSION=\"$(INFODOCK_VERSION_STRING)\" \ 57 -DPATH_VERSION=\"$(INFODOCK_VERSION_STRING)\" \
55 -DPATH_PROGNAME=\"infodock\" \ 58 -DPATH_PROGNAME=\"infodock\" \
59 -DEMACS_PROGNAME=\"infodock\" \
60 -DEMACS_VERSION=\"$(INFODOCK_VERSION_STRING)\" \
56 -DINFODOCK_MAJOR_VERSION=$(infodock_major_version) \ 61 -DINFODOCK_MAJOR_VERSION=$(infodock_major_version) \
57 -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \ 62 -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \
58 -DINFODOCK_BUILD_VERSION=$(infodock_build_version) 63 -DINFODOCK_BUILD_VERSION=$(infodock_build_version)
59 !else 64 !else
60 !if "$(emacs_beta_version)" != "" 65 !if "$(emacs_beta_version)" != ""
62 !else 67 !else
63 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version) 68 XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)
64 !endif 69 !endif
65 PROGRAM_DEFINES= \ 70 PROGRAM_DEFINES= \
66 -DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\" \ 71 -DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\" \
67 -DPATH_PROGNAME=\"xemacs\" 72 -DPATH_PROGNAME=\"xemacs\" \
73 -DEMACS_VERSION=\"$(XEMACS_VERSION_STRING)\" \
74 -DEMACS_PROGNAME=\"xemacs\"
68 !endif 75 !endif
69 76
70 # 77 #
71 # Command line options defaults 78 # Command line options defaults
72 # 79 #
89 ! else 96 ! else
90 PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\xemacs-packages 97 PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\xemacs-packages
91 ! endif 98 ! endif
92 !endif 99 !endif
93 PATH_PACKAGEPATH="$(PACKAGE_PATH:\=\\)" 100 PATH_PACKAGEPATH="$(PACKAGE_PATH:\=\\)"
94 !if !defined(HAVE_MSW) 101 !if !defined(HAVE_MS_WINDOWS)
95 HAVE_MSW=1 102 HAVE_MS_WINDOWS=1
96 !endif 103 !endif
97 !if !defined(HAVE_X) 104 !if !defined(HAVE_X_WINDOWS)
98 HAVE_X=0 105 HAVE_X_WINDOWS=0
99 !endif 106 !endif
100 !if !defined(HAVE_XPM) 107 !if !defined(HAVE_XPM)
101 HAVE_XPM=0 108 HAVE_XPM=0
102 !endif 109 !endif
103 !if !defined(HAVE_PNG) 110 !if !defined(HAVE_PNG)
130 !if !defined(HAVE_WIDGETS) 137 !if !defined(HAVE_WIDGETS)
131 HAVE_WIDGETS=1 138 HAVE_WIDGETS=1
132 !endif 139 !endif
133 !if !defined(DEBUG_XEMACS) 140 !if !defined(DEBUG_XEMACS)
134 DEBUG_XEMACS=0 141 DEBUG_XEMACS=0
142 !endif
143 !if !defined(QUICK_BUILD)
144 QUICK_BUILD=0
135 !endif 145 !endif
136 !if !defined(USE_UNION_TYPE) 146 !if !defined(USE_UNION_TYPE)
137 USE_UNION_TYPE=0 147 USE_UNION_TYPE=0
138 !endif 148 !endif
139 !if !defined(USE_MINITAR) 149 !if !defined(USE_MINITAR)
199 !if !$(USE_SYSTEM_MALLOC) && $(USE_CRTDLL) 209 !if !$(USE_SYSTEM_MALLOC) && $(USE_CRTDLL)
200 !message GNU malloc currently cannot be used with CRT DLL. 210 !message GNU malloc currently cannot be used with CRT DLL.
201 !message [[[Developer note: If you want to fix it, read Q112297 first]]] #### 211 !message [[[Developer note: If you want to fix it, read Q112297 first]]] ####
202 CONFIG_ERROR=1 212 CONFIG_ERROR=1
203 !endif 213 !endif
204 !if !$(HAVE_MSW) && !$(HAVE_X) 214 !if !$(HAVE_MS_WINDOWS) && !$(HAVE_X_WINDOWS)
205 !message Please specify at least one HAVE_MSW=1 and/or HAVE_X=1 215 !message Please specify at least one HAVE_MS_WINDOWS=1 and/or HAVE_X_WINDOWS=1
206 CONFIG_ERROR=1 216 CONFIG_ERROR=1
207 !endif 217 !endif
208 !if $(HAVE_X) && !defined(X11_DIR) 218 !if $(HAVE_X_WINDOWS) && !defined(X11_DIR)
209 !message Please specify root directory for your X11 installation: X11_DIR=path 219 !message Please specify root directory for your X11 installation: X11_DIR=path
210 CONFIG_ERROR=1 220 CONFIG_ERROR=1
211 !endif 221 !endif
212 !if $(HAVE_X) && defined(X11_DIR) && !exist("$(X11_DIR)\LIB\X11.LIB") 222 !if $(HAVE_X_WINDOWS) && defined(X11_DIR) && !exist("$(X11_DIR)\LIB\X11.LIB")
213 !message Specified X11 directory does not contain "$(X11_DIR)\LIB\X11.LIB" 223 !message Specified X11 directory does not contain "$(X11_DIR)\LIB\X11.LIB"
214 CONFIG_ERROR=1 224 CONFIG_ERROR=1
215 !endif 225 !endif
216 !if $(HAVE_MSW) && $(HAVE_XPM) && !defined(XPM_DIR) 226 !if $(HAVE_MS_WINDOWS) && $(HAVE_XPM) && !defined(XPM_DIR)
217 !message Please specify root directory for your XPM installation: XPM_DIR=path 227 !message Please specify root directory for your XPM installation: XPM_DIR=path
218 CONFIG_ERROR=1 228 CONFIG_ERROR=1
219 !endif 229 !endif
220 !if $(HAVE_MSW) && $(HAVE_XPM) && defined(XPM_DIR) && !exist("$(XPM_DIR)\lib\Xpm.lib") 230 !if $(HAVE_MS_WINDOWS) && $(HAVE_XPM) && defined(XPM_DIR) && !exist("$(XPM_DIR)\lib\Xpm.lib")
221 !message Specified XPM directory does not contain "$(XPM_DIR)\lib\Xpm.lib" 231 !message Specified XPM directory does not contain "$(XPM_DIR)\lib\Xpm.lib"
222 CONFIG_ERROR=1 232 CONFIG_ERROR=1
223 !endif 233 !endif
224 !if $(HAVE_MSW) && $(HAVE_PNG) && !defined(PNG_DIR) 234 !if $(HAVE_MS_WINDOWS) && $(HAVE_PNG) && !defined(PNG_DIR)
225 !message Please specify root directory for your PNG installation: PNG_DIR=path 235 !message Please specify root directory for your PNG installation: PNG_DIR=path
226 CONFIG_ERROR=1 236 CONFIG_ERROR=1
227 !endif 237 !endif
228 !if $(HAVE_MSW) && $(HAVE_PNG) && defined(PNG_DIR) && !exist("$(PNG_DIR)\libpng.lib") 238 !if $(HAVE_MS_WINDOWS) && $(HAVE_PNG) && defined(PNG_DIR) && !exist("$(PNG_DIR)\libpng.lib")
229 !message Specified PNG directory does not contain "$(PNG_DIR)\libpng.lib" 239 !message Specified PNG directory does not contain "$(PNG_DIR)\libpng.lib"
230 CONFIG_ERROR=1 240 CONFIG_ERROR=1
231 !endif 241 !endif
232 !if $(HAVE_MSW) && $(HAVE_PNG) && !defined(ZLIB_DIR) 242 !if $(HAVE_MS_WINDOWS) && $(HAVE_PNG) && !defined(ZLIB_DIR)
233 !message Please specify root directory for your ZLIB installation: ZLIB_DIR=path 243 !message Please specify root directory for your ZLIB installation: ZLIB_DIR=path
234 CONFIG_ERROR=1 244 CONFIG_ERROR=1
235 !endif 245 !endif
236 !if $(HAVE_MSW) && $(HAVE_PNG) && defined(ZLIB_DIR) && !exist("$(ZLIB_DIR)\zlib.lib") 246 !if $(HAVE_MS_WINDOWS) && $(HAVE_PNG) && defined(ZLIB_DIR) && !exist("$(ZLIB_DIR)\zlib.lib")
237 !message Specified ZLIB directory does not contain "$(ZLIB_DIR)\zlib.lib" 247 !message Specified ZLIB directory does not contain "$(ZLIB_DIR)\zlib.lib"
238 CONFIG_ERROR=1 248 CONFIG_ERROR=1
239 !endif 249 !endif
240 !if $(HAVE_MSW) && $(HAVE_TIFF) && !defined(TIFF_DIR) 250 !if $(HAVE_MS_WINDOWS) && $(HAVE_TIFF) && !defined(TIFF_DIR)
241 !message Please specify root directory for your TIFF installation: TIFF_DIR=path 251 !message Please specify root directory for your TIFF installation: TIFF_DIR=path
242 CONFIG_ERROR=1 252 CONFIG_ERROR=1
243 !endif 253 !endif
244 !if $(HAVE_MSW) && $(HAVE_TIFF) && !exist("$(TIFF_DIR)\libtiff\libtiff.lib") 254 !if $(HAVE_MS_WINDOWS) && $(HAVE_TIFF) && !exist("$(TIFF_DIR)\libtiff\libtiff.lib")
245 !message Specified TIFF directory does not contain "$(TIFF_DIR)\libtiff\libtiff.lib" 255 !message Specified TIFF directory does not contain "$(TIFF_DIR)\libtiff\libtiff.lib"
246 CONFIG_ERROR=1 256 CONFIG_ERROR=1
247 !endif 257 !endif
248 !if $(HAVE_MSW) && $(HAVE_JPEG) && !defined(JPEG_DIR) 258 !if $(HAVE_MS_WINDOWS) && $(HAVE_JPEG) && !defined(JPEG_DIR)
249 !message Please specify root directory for your JPEG installation: JPEG_DIR=path 259 !message Please specify root directory for your JPEG installation: JPEG_DIR=path
250 CONFIG_ERROR=1 260 CONFIG_ERROR=1
251 !endif 261 !endif
252 !if $(HAVE_MSW) && $(HAVE_JPEG) && !exist("$(JPEG_DIR)\libjpeg.lib") 262 !if $(HAVE_MS_WINDOWS) && $(HAVE_JPEG) && !exist("$(JPEG_DIR)\libjpeg.lib")
253 !message Specified JPEG directory does not contain "$(JPEG_DIR)\libjpeg.lib" 263 !message Specified JPEG directory does not contain "$(JPEG_DIR)\libjpeg.lib"
254 CONFIG_ERROR=1 264 CONFIG_ERROR=1
255 !endif 265 !endif
256 !if $(HAVE_MSW) && $(HAVE_XFACE) && !defined(COMPFACE_DIR) 266 !if $(HAVE_MS_WINDOWS) && $(HAVE_XFACE) && !defined(COMPFACE_DIR)
257 !message Please specify root directory for your COMPFACE installation: COMPFACE_DIR=path 267 !message Please specify root directory for your COMPFACE installation: COMPFACE_DIR=path
258 CONFIG_ERROR=1 268 CONFIG_ERROR=1
259 !endif 269 !endif
260 !if $(HAVE_MSW) && $(HAVE_XFACE) && !exist("$(COMPFACE_DIR)\libcompface.lib") 270 !if $(HAVE_MS_WINDOWS) && $(HAVE_XFACE) && !exist("$(COMPFACE_DIR)\libcompface.lib")
261 !message Specified COMPFACE directory does not contain "$(COMPFACE_DIR)\libcompface.lib" 271 !message Specified COMPFACE directory does not contain "$(COMPFACE_DIR)\libcompface.lib"
262 CONFIG_ERROR=1 272 CONFIG_ERROR=1
263 !endif 273 !endif
264 !if $(HAVE_MSW) && $(HAVE_TOOLBARS) && !$(HAVE_XPM) 274 !if $(HAVE_MS_WINDOWS) && $(HAVE_TOOLBARS) && !$(HAVE_XPM)
265 !message Toolbars require XPM support 275 !message Toolbars require XPM support
266 CONFIG_ERROR=1 276 CONFIG_ERROR=1
267 !endif 277 !endif
268 !if $(CONFIG_ERROR) 278 !if $(CONFIG_ERROR)
269 !error Configuration error(s) found 279 !error Configuration error(s) found
273 # Handle GUNG_HO 283 # Handle GUNG_HO
274 # 284 #
275 !if defined(GUNG_HO) 285 !if defined(GUNG_HO)
276 USE_MINIMAL_TAGBITS=$(GUNG_HO) 286 USE_MINIMAL_TAGBITS=$(GUNG_HO)
277 USE_INDEXED_LRECORD_IMPLEMENTATION=$(GUNG_HO) 287 USE_INDEXED_LRECORD_IMPLEMENTATION=$(GUNG_HO)
288 !endif
289
290 #
291 # Whether to use dependency information generated by make-src-depend
292 #
293 !if !defined(DEPEND)
294 DEPEND=0
295 !endif
296 !if $(DEPEND)
297 ! if [if not exist $(OUTDIR)\nul mkdir "$(OUTDIR)"]
298 ! endif
299 # generate an nmake-readable version of depend
300 ! if [perl -p -e "s/^\x23ifdef (.+)/!if defined($$1)/; s/^\x23e/!e/;" \
301 -e "s/([\s=^])([\w\d\.\-^]+\.[ch^])/$$1$(SRC:\=\\)\\$$2/g;" \
302 -e "s/^(.+)\.o:(.+)/$(OUTDIR:\=\\)\\$$1.obj:$$2 $(NT:\=\\)\\config.inc/;" \
303 < $(SRC)\depend > $(OUTDIR)\depend.tmp]
304 ! endif
305 ! include "$(OUTDIR)\depend.tmp"
306 !else
307 ! if [echo WARNING: Compiling without dependency information.]
308 ! endif
278 !endif 309 !endif
279 310
280 # 311 #
281 # Compiler command echo control. Define VERBOSECC=1 to get verbose compilation. 312 # Compiler command echo control. Define VERBOSECC=1 to get verbose compilation.
282 # 313 #
308 LIBC_LIB=libc.lib 339 LIBC_LIB=libc.lib
309 !endif 340 !endif
310 341
311 CFLAGS=-nologo -W3 $(OPT) $(C_LIBFLAG) 342 CFLAGS=-nologo -W3 $(OPT) $(C_LIBFLAG)
312 343
313 !if $(HAVE_X) 344 !if $(HAVE_X_WINDOWS)
314 X_DEFINES=-DHAVE_X_WINDOWS 345 X_DEFINES=-DHAVE_X_WINDOWS
315 X_INCLUDES=-I$(X11_DIR)\include 346 X_INCLUDES=-I$(X11_DIR)\include
316 X_LIBS=-libpath:$(X11_DIR)\lib Xaw.lib Xmu.lib Xt.lib SM.lib ICE.lib Xext.lib X11.lib 347 X_LIBS=-libpath:$(X11_DIR)\lib Xaw.lib Xmu.lib Xt.lib SM.lib ICE.lib Xext.lib X11.lib
317 !endif 348 !endif
318 349
319 !if $(HAVE_MSW) 350 !if $(HAVE_MS_WINDOWS)
320 MSW_DEFINES=-DHAVE_MS_WINDOWS -DHAVE_SCROLLBARS -DHAVE_MENUBARS 351 MSW_DEFINES=-DHAVE_MS_WINDOWS -DHAVE_SCROLLBARS -DHAVE_MENUBARS
321 MSW_INCLUDES= 352 MSW_INCLUDES=
322 MSW_LIBS= 353 MSW_LIBS=
323 !if $(HAVE_MSW_C_DIRED) 354 !if $(HAVE_MSW_C_DIRED)
324 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_MSW_C_DIRED 355 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_MSW_C_DIRED
381 !if $(DEBUG_XEMACS) 412 !if $(DEBUG_XEMACS)
382 DEBUG_DEFINES=-DDEBUG_XEMACS -D_DEBUG 413 DEBUG_DEFINES=-DDEBUG_XEMACS -D_DEBUG
383 DEBUG_FLAGS=-debug:full 414 DEBUG_FLAGS=-debug:full
384 !endif 415 !endif
385 416
417 !if $(QUICK_BUILD)
418 QUICK_DEFINES=-DQUICK_BUILD
419 !endif
420
386 !if $(USE_MINIMAL_TAGBITS) 421 !if $(USE_MINIMAL_TAGBITS)
387 TAGBITS_DEFINES=-DUSE_MINIMAL_TAGBITS 422 TAGBITS_DEFINES=-DUSE_MINIMAL_TAGBITS
388 !endif 423 !endif
389 !if $(USE_INDEXED_LRECORD_IMPLEMENTATION) 424 !if $(USE_INDEXED_LRECORD_IMPLEMENTATION)
390 LRECORD_DEFINES=-DUSE_INDEXED_LRECORD_IMPLEMENTATION 425 LRECORD_DEFINES=-DUSE_INDEXED_LRECORD_IMPLEMENTATION
413 448
414 PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX)\" 449 PATH_DEFINES=-DPATH_PREFIX=\"$(PATH_PREFIX)\"
415 450
416 # Generic variables 451 # Generic variables
417 452
418 INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(NT)\inc -I$(SRC) -I$(XEMACS)\lwlib 453 INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(NT)\inc -I$(SRC) -I$(LWLIB_SRCDIR)
419 454
420 DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) \ 455 DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) \
421 $(TAGBITS_DEFINES) $(LRECORD_DEFINES) $(UNION_DEFINES) \ 456 $(TAGBITS_DEFINES) $(LRECORD_DEFINES) $(UNION_DEFINES) \
422 $(DUMPER_DEFINES) $(MALLOC_DEFINES) \ 457 $(DUMPER_DEFINES) $(MALLOC_DEFINES) $(QUICK_DEFINES) \
423 -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN -DWINDOWSNT -Demacs \ 458 -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN -DWINDOWSNT -Demacs \
424 -DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES) 459 -DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
425 460
426 #------------------------------------------------------------------------------ 461 #------------------------------------------------------------------------------
427
428 default: $(OUTDIR)\nul all
429 462
430 $(OUTDIR)\nul: 463 $(OUTDIR)\nul:
431 -@mkdir $(OUTDIR) 464 -@mkdir $(OUTDIR)
432 465
433 XEMACS_INCLUDES=\ 466 XEMACS_INCLUDES=\
489 cd $(NT) 522 cd $(NT)
490 $(LIB_SRC)/minitar.exe : $(NT)/minitar.mak $(NT)/minitar.c 523 $(LIB_SRC)/minitar.exe : $(NT)/minitar.mak $(NT)/minitar.c
491 nmake -nologo -f minitar.mak ZLIB="$(ZLIB_DIR)" NT="$(NT)" LIB_SRC="$(LIB_SRC)" 524 nmake -nologo -f minitar.mak ZLIB="$(ZLIB_DIR)" NT="$(NT)" LIB_SRC="$(LIB_SRC)"
492 525
493 LIB_SRC_TOOLS = \ 526 LIB_SRC_TOOLS = \
527 $(LIB_SRC)/etags.exe \
528 $(LIB_SRC)/hexl.exe \
529 $(LIB_SRC)/i.exe \
494 $(LIB_SRC)/make-docfile.exe \ 530 $(LIB_SRC)/make-docfile.exe \
495 $(LIB_SRC)/hexl.exe \ 531 $(LIB_SRC)/mmencode.exe \
496 $(LIB_SRC)/movemail.exe \ 532 $(LIB_SRC)/movemail.exe \
497 $(LIB_SRC)/mmencode.exe \
498 $(LIB_SRC)/sorted-doc.exe \ 533 $(LIB_SRC)/sorted-doc.exe \
499 $(LIB_SRC)/wakeup.exe \ 534 $(LIB_SRC)/wakeup.exe
500 $(LIB_SRC)/etags.exe
501 !if $(USE_MINITAR) 535 !if $(USE_MINITAR)
502 LIB_SRC_TOOLS = \ 536 LIB_SRC_TOOLS = \
503 $(LIB_SRC_TOOLS) \ 537 $(LIB_SRC_TOOLS) \
504 $(LIB_SRC)/minitar.exe 538 $(LIB_SRC)/minitar.exe
505 !endif 539 !endif
506 !if $(USE_PORTABLE_DUMPER) 540 !if $(USE_PORTABLE_DUMPER)
507 LIB_SRC_TOOLS = \ 541 LIB_SRC_TOOLS = \
508 $(XEMACS_INCLUDES) \ 542 $(XEMACS_INCLUDES) \
543 $(LIB_SRC)/make-dump-id.exe \
509 $(LIB_SRC_TOOLS) 544 $(LIB_SRC_TOOLS)
510 !endif 545 !endif
511 546
512 # Shorthand target 547 # Shorthand target
513 minitar: $(LIB_SRC)/minitar.exe 548 minitar: $(LIB_SRC)/minitar.exe
521 $(RUNEMACS): $(LIB_SRC)\run.c $(LIB_SRC)\run.res 556 $(RUNEMACS): $(LIB_SRC)\run.c $(LIB_SRC)\run.res
522 $(CCV) -I$(LIB_SRC) $(CFLAGS) -Fe$@ -Fo$(LIB_SRC) -Fd$(LIB_SRC)\ $** kernel32.lib user32.lib -link -incremental:no 557 $(CCV) -I$(LIB_SRC) $(CFLAGS) -Fe$@ -Fo$(LIB_SRC) -Fd$(LIB_SRC)\ $** kernel32.lib user32.lib -link -incremental:no
523 558
524 $(LIB_SRC)\run.res: $(LIB_SRC)\run.rc 559 $(LIB_SRC)\run.res: $(LIB_SRC)\run.rc
525 rc -I$(LIB_SRC) -Fo$@ $** 560 rc -I$(LIB_SRC) -Fo$@ $**
561
562 #------------------------------------------------------------------------------
563
564 # dump-id.c file that contains the dump id
565
566 $(SRC)\dump-id.c : $(LIB_SRC)/make-dump-id.exe
567 cd $(SRC)
568 $(LIB_SRC)\make-dump-id.exe
569 cd $(NT)
526 570
527 #------------------------------------------------------------------------------ 571 #------------------------------------------------------------------------------
528 572
529 # LASTFILE Library 573 # LASTFILE Library
530 574
544 588
545 !endif 589 !endif
546 590
547 #------------------------------------------------------------------------------ 591 #------------------------------------------------------------------------------
548 592
549 !if $(HAVE_X) 593 !if $(HAVE_X_WINDOWS)
550 594
551 # LWLIB Library 595 # LWLIB Library
552 596
553 LWLIB=$(OUTDIR)\lwlib.lib 597 LWLIB=$(OUTDIR)\lwlib.lib
554 LWLIB_SRC=$(XEMACS)\lwlib
555 LWLIB_FLAGS=$(CFLAGS) $(INCLUDES) $(DEFINES) \ 598 LWLIB_FLAGS=$(CFLAGS) $(INCLUDES) $(DEFINES) \
556 -DNEED_ATHENA -DNEED_LUCID \ 599 -DNEED_ATHENA -DNEED_LUCID \
557 -D_WINDOWS -DMENUBARS_LUCID -DSCROLLBARS_LUCID -DDIALOGS_ATHENA \ 600 -D_WINDOWS -DMENUBARS_LUCID -DSCROLLBARS_LUCID -DDIALOGS_ATHENA \
558 -Fo$@ -c 601 -Fo$@ -c
559 LWLIB_OBJS= \ 602 LWLIB_OBJS= \
566 $(OUTDIR)\xlwscrollbar.obj 609 $(OUTDIR)\xlwscrollbar.obj
567 610
568 $(LWLIB): $(LWLIB_OBJS) 611 $(LWLIB): $(LWLIB_OBJS)
569 link.exe -lib -nologo -out:$@ $(LWLIB_OBJS) 612 link.exe -lib -nologo -out:$@ $(LWLIB_OBJS)
570 613
571 $(OUTDIR)\lwlib-config.obj: $(LWLIB_SRC)\lwlib-config.c 614 $(OUTDIR)\lwlib-config.obj: $(LWLIB_SRCDIR)\lwlib-config.c
572 $(CCV) $(LWLIB_FLAGS) $** 615 $(CCV) $(LWLIB_FLAGS) $**
573 616
574 $(OUTDIR)\lwlib-utils.obj: $(LWLIB_SRC)\lwlib-utils.c 617 $(OUTDIR)\lwlib-utils.obj: $(LWLIB_SRCDIR)\lwlib-utils.c
575 $(CCV) $(LWLIB_FLAGS) $** 618 $(CCV) $(LWLIB_FLAGS) $**
576 619
577 $(OUTDIR)\lwlib-Xaw.obj: $(LWLIB_SRC)\lwlib-Xaw.c 620 $(OUTDIR)\lwlib-Xaw.obj: $(LWLIB_SRCDIR)\lwlib-Xaw.c
578 $(CCV) $(LWLIB_FLAGS) $** 621 $(CCV) $(LWLIB_FLAGS) $**
579 622
580 $(OUTDIR)\lwlib-Xlw.obj: $(LWLIB_SRC)\lwlib-Xlw.c 623 $(OUTDIR)\lwlib-Xlw.obj: $(LWLIB_SRCDIR)\lwlib-Xlw.c
581 $(CCV) $(LWLIB_FLAGS) $** 624 $(CCV) $(LWLIB_FLAGS) $**
582 625
583 $(OUTDIR)\lwlib.obj: $(LWLIB_SRC)\lwlib.c 626 $(OUTDIR)\lwlib.obj: $(LWLIB_SRCDIR)\lwlib.c
584 $(CCV) $(LWLIB_FLAGS) $** 627 $(CCV) $(LWLIB_FLAGS) $**
585 628
586 $(OUTDIR)\xlwmenu.obj: $(LWLIB_SRC)\xlwmenu.c 629 $(OUTDIR)\xlwmenu.obj: $(LWLIB_SRCDIR)\xlwmenu.c
587 $(CCV) $(LWLIB_FLAGS) $** 630 $(CCV) $(LWLIB_FLAGS) $**
588 631
589 $(OUTDIR)\xlwscrollbar.obj: $(LWLIB_SRC)\xlwscrollbar.c 632 $(OUTDIR)\xlwscrollbar.obj: $(LWLIB_SRCDIR)\xlwscrollbar.c
590 $(CCV) $(LWLIB_FLAGS) $** 633 $(CCV) $(LWLIB_FLAGS) $**
591 634
592 !endif 635 !endif
593 #------------------------------------------------------------------------------ 636 #------------------------------------------------------------------------------
594 637
683 $(SRC)\tparam.c \ 726 $(SRC)\tparam.c \
684 $(SRC)\undo.c \ 727 $(SRC)\undo.c \
685 $(SRC)\window.c \ 728 $(SRC)\window.c \
686 $(SRC)\widget.c 729 $(SRC)\widget.c
687 730
688 !if $(HAVE_X) 731 !if $(HAVE_X_WINDOWS)
689 DOC_SRC6=\ 732 DOC_SRC6=\
690 $(SRC)\balloon_help.c \ 733 $(SRC)\balloon_help.c \
691 $(SRC)\console-x.c \ 734 $(SRC)\console-x.c \
692 $(SRC)\device-x.c \ 735 $(SRC)\device-x.c \
693 $(SRC)\dialog-x.c \ 736 $(SRC)\dialog-x.c \
708 $(SRC)\xgccache.c \ 751 $(SRC)\xgccache.c \
709 $(SRC)\xmu.c \ 752 $(SRC)\xmu.c \
710 $(SRC)\select-x.c 753 $(SRC)\select-x.c
711 !endif 754 !endif
712 755
713 !if $(HAVE_MSW) 756 !if $(HAVE_MS_WINDOWS)
714 DOC_SRC7=\ 757 DOC_SRC7=\
715 $(SRC)\console-msw.c \ 758 $(SRC)\console-msw.c \
716 $(SRC)\device-msw.c \ 759 $(SRC)\device-msw.c \
717 $(SRC)\event-msw.c \ 760 $(SRC)\event-msw.c \
718 $(SRC)\frame-msw.c \ 761 $(SRC)\frame-msw.c \
732 !if $(HAVE_MULE) 775 !if $(HAVE_MULE)
733 DOC_SRC8=\ 776 DOC_SRC8=\
734 $(SRC)\mule.c \ 777 $(SRC)\mule.c \
735 $(SRC)\mule-charset.c \ 778 $(SRC)\mule-charset.c \
736 $(SRC)\mule-ccl.c 779 $(SRC)\mule-ccl.c
737 ! if $(HAVE_X) 780 ! if $(HAVE_X_WINDOWS)
738 DOC_SRC8=$(DOC_SRC8) $(SRC)\input-method-xlib.c 781 DOC_SRC8=$(DOC_SRC8) $(SRC)\input-method-xlib.c
739 ! endif 782 ! endif
740 !endif 783 !endif
741 784
742 !if $(DEBUG_XEMACS) 785 !if $(DEBUG_XEMACS)
754 !endif 797 !endif
755 798
756 !if !$(USE_PORTABLE_DUMPER) 799 !if !$(USE_PORTABLE_DUMPER)
757 DOC_SRC11=\ 800 DOC_SRC11=\
758 $(SRC)\unexnt.c 801 $(SRC)\unexnt.c
802 !else
803 DOC_SRC11=\
804 $(SRC)\dumper.c
759 !endif 805 !endif
760 806
761 #------------------------------------------------------------------------------ 807 #------------------------------------------------------------------------------
762 808
763 # TEMACS Executable 809 # TEMACS Executable
787 TEMACS_CPP_FLAGS=-c \ 833 TEMACS_CPP_FLAGS=-c \
788 $(CFLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \ 834 $(CFLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \
789 -DEMACS_MAJOR_VERSION=$(emacs_major_version) \ 835 -DEMACS_MAJOR_VERSION=$(emacs_major_version) \
790 -DEMACS_MINOR_VERSION=$(emacs_minor_version) \ 836 -DEMACS_MINOR_VERSION=$(emacs_minor_version) \
791 $(EMACS_BETA_VERSION) \ 837 $(EMACS_BETA_VERSION) \
792 -DXEMACS_CODENAME=\"$(xemacs_codename)\" \ 838 -DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \
793 -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \ 839 -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \
794 -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\" 840 -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\"
795 841
796 !if $(HAVE_X) 842 !if $(HAVE_X_WINDOWS)
797 TEMACS_X_OBJS=\ 843 TEMACS_X_OBJS=\
798 $(OUTDIR)\balloon-x.obj \ 844 $(OUTDIR)\balloon-x.obj \
799 $(OUTDIR)\balloon_help.obj \ 845 $(OUTDIR)\balloon_help.obj \
800 $(OUTDIR)\console-x.obj \ 846 $(OUTDIR)\console-x.obj \
801 $(OUTDIR)\device-x.obj \ 847 $(OUTDIR)\device-x.obj \
816 $(OUTDIR)\xgccache.obj \ 862 $(OUTDIR)\xgccache.obj \
817 $(OUTDIR)\xmu.obj \ 863 $(OUTDIR)\xmu.obj \
818 $(OUTDIR)\select-x.obj 864 $(OUTDIR)\select-x.obj
819 !endif 865 !endif
820 866
821 !if $(HAVE_MSW) 867 !if $(HAVE_MS_WINDOWS)
822 TEMACS_MSW_OBJS=\ 868 TEMACS_MSW_OBJS=\
823 $(OUTDIR)\console-msw.obj \ 869 $(OUTDIR)\console-msw.obj \
824 $(OUTDIR)\device-msw.obj \ 870 $(OUTDIR)\device-msw.obj \
825 $(OUTDIR)\event-msw.obj \ 871 $(OUTDIR)\event-msw.obj \
826 $(OUTDIR)\frame-msw.obj \ 872 $(OUTDIR)\frame-msw.obj \
840 !if $(HAVE_MULE) 886 !if $(HAVE_MULE)
841 TEMACS_MULE_OBJS=\ 887 TEMACS_MULE_OBJS=\
842 $(OUTDIR)\mule.obj \ 888 $(OUTDIR)\mule.obj \
843 $(OUTDIR)\mule-charset.obj \ 889 $(OUTDIR)\mule-charset.obj \
844 $(OUTDIR)\mule-ccl.obj 890 $(OUTDIR)\mule-ccl.obj
845 ! if $(HAVE_X) 891 ! if $(HAVE_X_WINDOWS)
846 TEMACS_MULE_OBJS=\ 892 TEMACS_MULE_OBJS=\
847 $(TEMACS_MULE_OBJS) $(OUTDIR)\input-method-xlib.obj 893 $(TEMACS_MULE_OBJS) $(OUTDIR)\input-method-xlib.obj
848 ! endif 894 ! endif
849 !endif 895 !endif
850 896
863 !endif 909 !endif
864 910
865 !if !$(USE_PORTABLE_DUMPER) 911 !if !$(USE_PORTABLE_DUMPER)
866 TEMACS_DUMP_OBJS=\ 912 TEMACS_DUMP_OBJS=\
867 $(OUTDIR)\unexnt.obj 913 $(OUTDIR)\unexnt.obj
914 !else
915 TEMACS_DUMP_OBJS=\
916 $(OUTDIR)\dumper.obj
868 !endif 917 !endif
869 918
870 TEMACS_OBJS= \ 919 TEMACS_OBJS= \
871 $(TEMACS_X_OBJS)\ 920 $(TEMACS_X_OBJS)\
872 $(TEMACS_MSW_OBJS)\ 921 $(TEMACS_MSW_OBJS)\
973 !else 1022 !else
974 {$(TEMACS_SRC)}.c{$(OUTDIR)}.obj: 1023 {$(TEMACS_SRC)}.c{$(OUTDIR)}.obj:
975 $(CCV) $(TEMACS_CPP_FLAGS) $< -Fo$@ 1024 $(CCV) $(TEMACS_CPP_FLAGS) $< -Fo$@
976 !endif 1025 !endif
977 1026
1027 $(OUTDIR)\emacs.obj: $(XEMACS)\version.sh
1028
978 $(OUTDIR)\TopLevelEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c 1029 $(OUTDIR)\TopLevelEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c
979 $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL $** -Fo$@ 1030 $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL $** -Fo$@
980 1031
981 $(OUTDIR)\TransientEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c 1032 $(OUTDIR)\TransientEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c
982 $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TRANSIENT_EMACS_SHELL $** -Fo$@ 1033 $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TRANSIENT_EMACS_SHELL $** -Fo$@
994 @dir /b/s $(OUTDIR)\*.sbr > bscmake.tmp 1045 @dir /b/s $(OUTDIR)\*.sbr > bscmake.tmp
995 bscmake -nologo -o$(TEMACS_BROWSE) @bscmake.tmp 1046 bscmake -nologo -o$(TEMACS_BROWSE) @bscmake.tmp
996 @$(DEL) bscmake.tmp 1047 @$(DEL) bscmake.tmp
997 !endif 1048 !endif
998 !if $(USE_PORTABLE_DUMPER) 1049 !if $(USE_PORTABLE_DUMPER)
999 @if exist $(TEMACS_DIR)\xemacs.dmp del $(TEMACS_DIR)\xemacs.dmp 1050 @if exist $(SRC)\dump-id.c del $(SRC)\dump-id.c
1051 # make a new dump id file. There is probably a better way to do this, but this works
1052 @if exist $(OUTDIR)\dump-id.obj del $(OUTDIR)\dump-id.obj
1053 nmake -nologo -f xemacs.mak OUTDIR=$(OUTDIR) $(OUTDIR)\dump-id.obj
1000 link.exe @<< 1054 link.exe @<<
1001 $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(TEMACS_LIBS) 1055 $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj
1002 << 1056 <<
1003 !else 1057 !else
1004 link.exe @<< 1058 link.exe @<<
1005 $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) 1059 $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS)
1006 << 1060 <<
1007 !endif 1061 !endif
1008 1062
1009 $(OUTDIR)\xemacs.res: xemacs.rc 1063 $(OUTDIR)\xemacs.res: xemacs.rc
1010 rc -Fo$@ xemacs.rc 1064 rc -Fo$@ xemacs.rc
1011 1065
1066
1067 PROGNAME=$(SRC)\xemacs.exe
1068 TEMACS_BATCH="$(LIB_SRC)\i" "$(TEMACS)" -batch
1069 XEMACS_BATCH="$(LIB_SRC)\i" "$(PROGNAME)" -vanilla -batch
1070
1012 # Section handling automated tests starts here 1071 # Section handling automated tests starts here
1013 1072
1014 PROGNAME=$(SRC)\xemacs.exe
1015 blddir=$(MAKEDIR:\=\\)\\.. 1073 blddir=$(MAKEDIR:\=\\)\\..
1016 temacs_loadup=$(TEMACS) -batch -l $(LISP)/loadup.el 1074 temacs_loadup=$(TEMACS_BATCH) -l $(LISP)/loadup.el
1017 dump_temacs = $(temacs_loadup) dump 1075 dump_temacs = $(temacs_loadup) dump
1018 run_temacs = $(temacs_loadup) run-temacs 1076 run_temacs = $(temacs_loadup) run-temacs
1019 ## We have automated tests!! 1077 ## We have automated tests!!
1020 testdir=../tests/automated 1078 testdir=../tests/automated
1021 batch_test_emacs=-batch -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir) 1079 batch_test_emacs=-batch -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir)
1054 # Section handling tags ends here 1112 # Section handling tags ends here
1055 1113
1056 # Section handling info starts here 1114 # Section handling info starts here
1057 1115
1058 !if !defined(MAKEINFO) 1116 !if !defined(MAKEINFO)
1059 MAKEINFO=$(PROGNAME) -vanilla -batch -l texinfmt -f batch-texinfo-format 1117 MAKEINFO=$(XEMACS_BATCH) -l texinfmt -f batch-texinfo-format
1060 !endif 1118 !endif
1061 1119
1062 MANDIR = $(XEMACS)\man 1120 MANDIR = $(XEMACS)\man
1063 INFODIR = $(XEMACS)\info 1121 INFODIR = $(XEMACS)\info
1064 INFO_FILES= \ 1122 INFO_FILES= \
1235 1293
1236 makeinfo-test: 1294 makeinfo-test:
1237 @<<makeinfo_test.bat 1295 @<<makeinfo_test.bat
1238 @echo off 1296 @echo off
1239 if exist "$(MAKEINFO)" goto test_done 1297 if exist "$(MAKEINFO)" goto test_done
1240 @"$(PROGNAME)" -batch -vanilla -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))" 1298 @$(XEMACS_BATCH) -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))"
1241 @if not errorlevel 1 goto suggest_makeinfo 1299 @if not errorlevel 1 goto suggest_makeinfo
1242 @echo XEmacs `info' cannot be built! 1300 @echo XEmacs `info' cannot be built!
1243 @echo Install XEmacs package `texinfo' (see README.packages). 1301 @echo Install XEmacs package `texinfo' (see README.packages).
1244 :suggest_makeinfo 1302 :suggest_makeinfo
1245 @echo Consider specifying path to makeinfo program: MAKEINFO=path 1303 @echo Consider specifying path to makeinfo program: MAKEINFO=path
1259 # Rebuild docfile target 1317 # Rebuild docfile target
1260 docfile :: 1318 docfile ::
1261 if exist $(DOC) del $(DOC) 1319 if exist $(DOC) del $(DOC)
1262 docfile :: $(DOC) 1320 docfile :: $(DOC)
1263 1321
1264 $(DOC): $(LIB_SRC)\make-docfile.exe 1322 $(DOC): $(LIB_SRC)\make-docfile.exe $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(DOC_SRC7) $(DOC_SRC8) $(DOC_SRC9) $(DOC_SRC10) $(DOC_SRC11)
1265 if exist $(DOC) del $(DOC) 1323 if exist $(DOC) del $(DOC)
1266 set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH) 1324 set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
1267 set EMACSBOOTSTRAPMODULEPATH=$(MODULES) 1325 set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
1268 $(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages 1326 $(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages
1269 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC1) 1327 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC1)
1270 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC2) 1328 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC2)
1271 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC3) 1329 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC3)
1272 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC4) 1330 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC4)
1273 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC5) 1331 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC5)
1279 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC11) 1337 $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC11)
1280 1338
1281 update-elc: 1339 update-elc:
1282 set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH) 1340 set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
1283 set EMACSBOOTSTRAPMODULEPATH=$(MODULES) 1341 set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
1284 $(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\update-elc.el 1342 $(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\update-elc.el
1343
1344 # This file is touched by update-elc.el when redumping is necessary.
1345 $(TEMACS_DIR)\NEEDTODUMP :
1346 @echo >$(TEMACS_DIR)\NEEDTODUMP
1285 1347
1286 # This rule dumps xemacs and then possibly spawns sub-make if PURESPACE 1348 # This rule dumps xemacs and then possibly spawns sub-make if PURESPACE
1287 # requirements have changed. 1349 # requirements have changed.
1288 dump-xemacs: temacs 1350
1351 $(PROGNAME) : $(TEMACS) $(TEMACS_DIR)\NEEDTODUMP
1289 @echo >$(TEMACS_DIR)\SATISFIED 1352 @echo >$(TEMACS_DIR)\SATISFIED
1290 cd $(TEMACS_DIR) 1353 cd $(TEMACS_DIR)
1291 set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH) 1354 set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
1292 set EMACSBOOTSTRAPMODULEPATH=$(MODULES) 1355 set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
1293 -1 $(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\loadup.el dump 1356 -1 $(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\loadup.el dump
1294 !if $(USE_PORTABLE_DUMPER) 1357 !if $(USE_PORTABLE_DUMPER)
1295 rc -d INCLUDE_DUMP -Fo $(OUTDIR)\xemacs.res $(NT)\xemacs.rc 1358 rc -d INCLUDE_DUMP -Fo $(OUTDIR)\xemacs.res $(NT)\xemacs.rc
1296 link.exe @<< 1359 link.exe @<<
1297 $(TEMACS_LFLAGS) -out:xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) 1360 $(TEMACS_LFLAGS) -out:xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj
1298 << 1361 <<
1299 # Make the resource section read/write since almost all of it is the dump 1362 # Make the resource section read/write since almost all of it is the dump
1300 # data which needs to be writable. This avoids having to copy it. 1363 # data which needs to be writable. This avoids having to copy it.
1301 editbin -nologo -section:.rsrc,rw xemacs.exe 1364 editbin -nologo -section:.rsrc,rw xemacs.exe
1302 del $(TEMACS_DIR)\xemacs.dmp 1365 del $(TEMACS_DIR)\xemacs.dmp
1305 @if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@ 1368 @if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@
1306 #------------------------------------------------------------------------------ 1369 #------------------------------------------------------------------------------
1307 1370
1308 # use this rule to build the complete system 1371 # use this rule to build the complete system
1309 all: installation $(OUTDIR)\nul $(LASTFILE) $(LWLIB) \ 1372 all: installation $(OUTDIR)\nul $(LASTFILE) $(LWLIB) \
1310 $(LIB_SRC_TOOLS) $(RUNEMACS) $(TEMACS) update-elc $(DOC) dump-xemacs \ 1373 $(LIB_SRC_TOOLS) $(RUNEMACS) $(TEMACS) update-elc $(DOC) $(PROGNAME) \
1311 $(LISP)/auto-autoloads.el $(LISP)/custom-load.el info 1374 update-auto-and-custom info
1312 1375
1313 temacs: $(LASTFILE) $(TEMACS) 1376 temacs: $(LASTFILE) $(TEMACS)
1314 1377
1315 # use this rule to install the system 1378 # use this rule to install the system
1316 install: all 1379 install: all
1374 $(DEL) /s /q *.bak *.elc *.orig *.rej 1437 $(DEL) /s /q *.bak *.elc *.orig *.rej
1375 cd $(INFODIR) 1438 cd $(INFODIR)
1376 $(DEL) *.info* 1439 $(DEL) *.info*
1377 1440
1378 depend: 1441 depend:
1379 cd $(SRCDIR) 1442 cd $(SRC)
1380 perl ./make-src-depend > depend.tmp 1443 perl ./make-src-depend > depend.tmp
1381 perl -MFile::Compare -e "compare('depend.tmp', 'depend') && rename('depend.tmp', 'depend') or unlink('depend.tmp')" 1444 perl -MFile::Compare -e "compare('depend.tmp', 'depend') && rename('depend.tmp', 'depend') or unlink('depend.tmp')"
1382 1445
1383 $(XEMACS)\Installation:: installation 1446 $(XEMACS)\Installation:: installation
1384 1447
1397 Installing XEmacs in \"$(INSTALL_DIR:\=\\)\". 1460 Installing XEmacs in \"$(INSTALL_DIR:\=\\)\".
1398 Package path is $(PATH_PACKAGEPATH:"=\"). 1461 Package path is $(PATH_PACKAGEPATH:"=\").
1399 !if $(INFODOCK) 1462 !if $(INFODOCK)
1400 Building InfoDock. 1463 Building InfoDock.
1401 !endif 1464 !endif
1402 !if $(HAVE_MSW) 1465 !if $(HAVE_MS_WINDOWS)
1403 Compiling in support for Microsoft Windows native GUI. 1466 Compiling in support for Microsoft Windows native GUI.
1404 !endif 1467 !endif
1405 !if $(HAVE_X) 1468 !if $(HAVE_X_WINDOWS)
1406 Compiling in support for X-Windows. 1469 Compiling in support for X-Windows.
1407 !endif 1470 !endif
1408 !if $(HAVE_MULE) 1471 !if $(HAVE_MULE)
1409 Compiling in MULE. 1472 Compiling in MULE.
1410 !endif 1473 !endif
1480 Using DLL version of C runtime library 1543 Using DLL version of C runtime library
1481 !endif 1544 !endif
1482 !if $(DEBUG_XEMACS) 1545 !if $(DEBUG_XEMACS)
1483 Compiling in extra debug checks. XEmacs will be slow! 1546 Compiling in extra debug checks. XEmacs will be slow!
1484 !endif 1547 !endif
1548 !if $(QUICK_BUILD)
1549 Disabling non-essential build actions. Use with care!
1550 !endif
1485 <<NOKEEP 1551 <<NOKEEP
1486 @echo -------------------------------------------------------------------- 1552 @echo --------------------------------------------------------------------
1487 @type $(XEMACS)\Installation 1553 @type $(XEMACS)\Installation
1488 @echo -------------------------------------------------------------------- 1554 @echo --------------------------------------------------------------------
1489 1555
1490 # Update auto-autoloads.el and custom-load.el similar to what 1556 # Update auto-autoloads.el and custom-load.el similar to what
1491 # XEmacs.rules does for xemacs-packages. 1557 # XEmacs.rules does for xemacs-packages.
1492 VANILLA=-vanilla 1558 update-auto-and-custom:
1493 FORCE: 1559 # Don't delete this, because it forces rebuilding from scratch,
1494 $(LISP)\auto-autoloads.el: FORCE 1560 # which is time-consuming; and the autoload code is specifically
1495 @$(DEL) $(LISP)\auto-autoloads.el 1561 # written to do in-place updating.
1496 $(PROGNAME) $(VANILLA) -batch \ 1562 # @$(DEL) $(LISP)\auto-autoloads.el
1497 -l autoload -f batch-update-directory $(LISP) 1563 # Combine into one invocation to avoid repeated startup penalty.
1498 $(PROGNAME) $(VANILLA) -batch \ 1564 $(XEMACS_BATCH) -l autoload -f batch-update-one-directory $(LISP) -f batch-byte-compile-one-file $(LISP)\auto-autoloads.el -l cus-dep -f Custom-make-dependencies $(LISP)
1499 -f batch-byte-compile $@
1500 @$(DEL) $(LISP)\auto-autoloads.el~ 1565 @$(DEL) $(LISP)\auto-autoloads.el~
1501 1566
1502 $(LISP)\custom-load.el: FORCE
1503 $(PROGNAME) $(VANILLA) -batch -l cus-dep \
1504 -f Custom-make-dependencies $(LISP)
1505
1506 # DO NOT DELETE THIS LINE -- make depend depends on it. 1567 # DO NOT DELETE THIS LINE -- make depend depends on it.
1507 1568