Mercurial > hg > xemacs-beta
comparison nt/xemacs.mak @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | 2b6fa2618f76 |
children | f503f1607e8b |
comparison
equal
deleted
inserted
replaced
871:732270854293 | 872:79c6ff3eef26 |
---|---|
162 HAVE_TOOLBARS=$(HAVE_XPM) | 162 HAVE_TOOLBARS=$(HAVE_XPM) |
163 !endif | 163 !endif |
164 !if !defined(HAVE_DIALOGS) | 164 !if !defined(HAVE_DIALOGS) |
165 HAVE_DIALOGS=1 | 165 HAVE_DIALOGS=1 |
166 !endif | 166 !endif |
167 !if !defined(HAVE_MSW_C_DIRED) | |
168 HAVE_MSW_C_DIRED=1 | |
169 !endif | |
170 !if !defined(HAVE_NATIVE_SOUND) | 167 !if !defined(HAVE_NATIVE_SOUND) |
171 HAVE_NATIVE_SOUND=1 | 168 HAVE_NATIVE_SOUND=1 |
172 !endif | 169 !endif |
173 !if !defined(HAVE_WIDGETS) | 170 !if !defined(HAVE_WIDGETS) |
174 HAVE_WIDGETS=1 | 171 HAVE_WIDGETS=1 |
175 !endif | 172 !endif |
173 !if !defined(OPTIMIZED_BUILD) | |
174 OPTIMIZED_BUILD=1 | |
175 !endif | |
176 !if !defined(USE_FASTCALL) | |
177 # #### Change to 1 when I check in the ws with support for fastcall | |
178 USE_FASTCALL=0 | |
179 !endif | |
180 !if !defined(PROFILE_SUPPORT) | |
181 PROFILE_SUPPORT=0 | |
182 !endif | |
176 !if !defined(DEBUG_XEMACS) | 183 !if !defined(DEBUG_XEMACS) |
177 DEBUG_XEMACS=0 | 184 DEBUG_XEMACS=0 |
178 !endif | 185 !endif |
179 !if !defined(OPTIMIZED_BUILD) | 186 !if !defined(HAVE_VC6) |
180 OPTIMIZED_BUILD=0 | 187 HAVE_VC6=1 |
181 !endif | 188 !endif |
182 !if !defined(ERROR_CHECK_ALL) | 189 !if !defined(ERROR_CHECK_ALL) |
183 # Turn off when not a beta XEmacs. | 190 # Turn off when not a beta XEmacs. |
184 ERROR_CHECK_ALL=1 | 191 ERROR_CHECK_ALL=1 |
185 !endif | 192 !endif |
186 !if !defined(QUICK_BUILD) | 193 !if !defined(QUICK_BUILD) |
187 QUICK_BUILD=0 | 194 QUICK_BUILD=0 |
188 !endif | 195 !endif |
196 !if !defined(VERBOSECC) | |
197 VERBOSECC=0 | |
198 !endif | |
199 !if !defined(DEPEND) | |
200 DEPEND=0 | |
201 !endif | |
202 !if !defined(USE_PORTABLE_DUMPER) | |
203 USE_PORTABLE_DUMPER=1 | |
204 !endif | |
189 !if !defined(USE_UNION_TYPE) | 205 !if !defined(USE_UNION_TYPE) |
190 USE_UNION_TYPE=0 | 206 USE_UNION_TYPE=0 |
191 !endif | 207 !endif |
192 !if !defined(USE_MINITAR) | 208 !if !defined(USE_MINITAR) |
193 USE_MINITAR=$(HAVE_ZLIB) | 209 USE_MINITAR=$(HAVE_ZLIB) |
194 !endif | |
195 !if !defined(USE_PORTABLE_DUMPER) | |
196 USE_PORTABLE_DUMPER=1 | |
197 !endif | 210 !endif |
198 | 211 |
199 # A little bit of adhockery. Default to use system malloc and | 212 # A little bit of adhockery. Default to use system malloc and |
200 # DLL version of the C runtime library when using portable | 213 # DLL version of the C runtime library when using portable |
201 # dumping. These are the optimal settings. | 214 # dumping. These are the optimal settings. |
321 !endif | 334 !endif |
322 | 335 |
323 # | 336 # |
324 # Whether to use dependency information generated by make-src-depend | 337 # Whether to use dependency information generated by make-src-depend |
325 # | 338 # |
326 !if !defined(DEPEND) | |
327 DEPEND=0 | |
328 !endif | |
329 !if $(DEPEND) && exist("$(SRC)\depend") | 339 !if $(DEPEND) && exist("$(SRC)\depend") |
330 ! if [if not exist $(OUTDIR)\nul mkdir "$(OUTDIR)"] | 340 ! if [if not exist $(OUTDIR)\nul mkdir "$(OUTDIR)"] |
331 ! endif | 341 ! endif |
332 # This perl script used to be inline but that caused too many quoting problems | 342 # This perl script used to be inline but that caused too many quoting problems |
333 ! if [perl .\make-nt-depend -s=$(SRC) -c=$(NT) -o=$(OUTDIR) < $(SRC)\depend > $(OUTDIR)\depend.tmp] | 343 ! if [perl .\make-nt-depend -s=$(SRC) -c=$(NT) -o=$(OUTDIR) < $(SRC)\depend > $(OUTDIR)\depend.tmp] |
339 !endif | 349 !endif |
340 | 350 |
341 # | 351 # |
342 # Compiler command echo control. Define VERBOSECC=1 to get verbose compilation. | 352 # Compiler command echo control. Define VERBOSECC=1 to get verbose compilation. |
343 # | 353 # |
344 !if !defined(VERBOSECC) | |
345 VERBOSECC=0 | |
346 !endif | |
347 !if $(VERBOSECC) | 354 !if $(VERBOSECC) |
348 CCV=$(CC) | 355 CCV=$(CC) |
349 !else | 356 !else |
350 CCV=@$(CC) | 357 CCV=@$(CC) |
351 !endif | 358 !endif |
352 | 359 |
353 !if $(DEBUG_XEMACS) | 360 !if $(DEBUG_XEMACS) |
354 DEBUGFLAGS=-Zi | 361 |
355 !else | 362 # ---- Debugging support ---- |
356 DEBUGFLAGS= | 363 ! if $(HAVE_VC6) |
357 !endif | 364 # support edit-and-continue |
358 | 365 DEBUG_FLAGS_COMPILE=-ZI |
359 !if $(OPTIMIZED_BUILD) | 366 ! else |
360 OPTFLAGS=-O2 -G5 | 367 DEBUG_FLAGS_COMPILE=-Zi |
361 !else | 368 ! endif |
362 OPTFLAGS=-Od | 369 DEBUG_FLAGS_LINK=-debug:full |
370 DEBUG_DEFINES=-DDEBUG_XEMACS -D_DEBUG | |
371 #BROWSERFLAGS=-Fr -Fd$(OUTDIR)\temacs.pdb | |
372 BROWSERFLAGS=-Fr$*.sbr -Fd$(OUTDIR)\temacs.pdb | |
373 | |
374 !else | |
375 | |
376 # ---- No debugging support ---- | |
377 DEBUG_FLAGS_COMPILE= | |
378 DEBUG_FLAGS_LINK=-incremental:no | |
379 DEBUG_DEFINES=-DDEBUG_XEMACS -D_DEBUG | |
380 BROWSERFLAGS= | |
381 | |
363 !endif | 382 !endif |
364 | 383 |
365 !if $(USE_CRTDLL) | 384 !if $(USE_CRTDLL) |
366 !if $(DEBUG_XEMACS) | 385 ! if $(DEBUG_XEMACS) |
367 C_LIBFLAG=-MDd | 386 C_LIBFLAG=-MDd |
368 LIBC_LIB=msvcrtd.lib | 387 LIBC_LIB=msvcrtd.lib |
369 !else | 388 ! else |
370 C_LIBFLAG=-MD | 389 C_LIBFLAG=-MD |
371 LIBC_LIB=msvcrt.lib | 390 LIBC_LIB=msvcrt.lib |
372 !endif | 391 ! endif |
373 !else | 392 !else |
374 C_LIBFLAG=-ML | 393 C_LIBFLAG=-ML |
375 LIBC_LIB=libc.lib | 394 LIBC_LIB=libc.lib |
376 !endif | 395 !endif |
377 | 396 |
378 CFLAGS_NO_LIB=-nologo -W3 -DSTRICT $(DEBUGFLAGS) $(OPTFLAGS) | 397 !if $(OPTIMIZED_BUILD) |
398 # -G5 means optimize for Pentium. (According to the code-optimization | |
399 # article, -GB is the same as -G5, and -G6, i.e. optimze for Pentium Pro, | |
400 # gains you little over -G5 for PPro's but causes big slowdowns for | |
401 # Pentiums.) -GF means put strings in read-only memory; -Gr means use | |
402 # fastcall convention. Another possible addition: -Ob2 -- allows inlining | |
403 # of any function, not just those declared inline. Potential code size | |
404 # increase, though. | |
405 # | |
406 # #### Note: fastcall doesn't actually seem to make any difference, at least | |
407 # not using the (admittedly unscientific) test of (hanoi 6). The | |
408 # optimization article claims 1-2% improvement in both speed and size. | |
409 OPTFLAGS_FASTCALL =-O2 -G5 -Gr -Ob2 | |
410 OPTFLAGS_CDECL =-O2 -G5 -Ob2 | |
411 !else | |
412 OPTFLAGS_FASTCALL =-Od | |
413 OPTFLAGS_CDECL =-Od | |
414 !endif | |
415 | |
416 !if $(USE_FASTCALL) | |
417 OPTFLAGS = $(OPTFLAGS_FASTCALL) | |
418 !else | |
419 OPTFLAGS = $(OPTFLAGS_CDECL) | |
420 !endif | |
421 | |
422 !if $(PROFILE_SUPPORT) | |
423 PROFILE_FLAGS=-profile | |
424 !else | |
425 PROFILE_FLAGS= | |
426 !endif | |
427 | |
428 CFLAGS_NO_OPT=-nologo -W3 -DSTRICT $(DEBUG_FLAGS_COMPILE) | |
429 | |
430 CFLAGS_NO_LIB=$(CFLAGS_NO_OPT) $(OPTFLAGS) | |
379 CFLAGS=$(CFLAGS_NO_LIB) $(C_LIBFLAG) | 431 CFLAGS=$(CFLAGS_NO_LIB) $(C_LIBFLAG) |
432 | |
433 CFLAGS_CDECL_NO_LIB=$(CFLAGS_NO_OPT) $(OPTFLAGS_CDECL) | |
434 CFLAGS_CDECL=$(CFLAGS_CDECL_NO_LIB) $(C_LIBFLAG) | |
380 | 435 |
381 !if $(HAVE_X_WINDOWS) | 436 !if $(HAVE_X_WINDOWS) |
382 X_DEFINES=-DHAVE_X_WINDOWS | 437 X_DEFINES=-DHAVE_X_WINDOWS |
383 X_INCLUDES=-I$(X11_DIR)\include | 438 X_INCLUDES=-I$(X11_DIR)\include |
384 X_LIBS=-libpath:$(X11_DIR)\lib Xaw.lib Xmu.lib Xt.lib SM.lib ICE.lib Xext.lib X11.lib | 439 X_LIBS=-libpath:$(X11_DIR)\lib Xaw.lib Xmu.lib Xt.lib SM.lib ICE.lib Xext.lib X11.lib |
387 !if $(HAVE_MS_WINDOWS) | 442 !if $(HAVE_MS_WINDOWS) |
388 MSW_DEFINES=-DHAVE_MS_WINDOWS | 443 MSW_DEFINES=-DHAVE_MS_WINDOWS |
389 MSW_INCLUDES= | 444 MSW_INCLUDES= |
390 MSW_LIBS=comctl32.lib | 445 MSW_LIBS=comctl32.lib |
391 | 446 |
392 !if $(HAVE_MSW_C_DIRED) | |
393 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_MSW_C_DIRED | |
394 MSW_C_DIRED_OBJ=$(OUTDIR)\dired-msw.obj | |
395 !endif | |
396 !if $(HAVE_XPM) | 447 !if $(HAVE_XPM) |
397 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_XPM -DFOR_MSW | 448 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_XPM -DFOR_MSW |
398 MSW_INCLUDES=$(MSW_INCLUDES) -I"$(XPM_DIR)" -I"$(XPM_DIR)\lib" | 449 MSW_INCLUDES=$(MSW_INCLUDES) -I"$(XPM_DIR)" -I"$(XPM_DIR)\lib" |
399 MSW_LIBS=$(MSW_LIBS) "$(XPM_DIR)\lib\Xpm.lib" | 450 MSW_LIBS=$(MSW_LIBS) "$(XPM_DIR)\lib\Xpm.lib" |
400 !endif | 451 !endif |
451 !endif | 502 !endif |
452 !endif | 503 !endif |
453 | 504 |
454 !if $(MULE) | 505 !if $(MULE) |
455 MULE_DEFINES=-DMULE | 506 MULE_DEFINES=-DMULE |
456 !endif | |
457 | |
458 !if $(DEBUG_XEMACS) | |
459 DEBUG_DEFINES=-DDEBUG_XEMACS -D_DEBUG | |
460 DEBUG_FLAGS=-debug:full | |
461 !endif | 507 !endif |
462 | 508 |
463 !if $(QUICK_BUILD) | 509 !if $(QUICK_BUILD) |
464 QUICK_DEFINES=-DQUICK_BUILD | 510 QUICK_DEFINES=-DQUICK_BUILD |
465 !endif | 511 !endif |
555 # PATH_PACKAGEPATH is already a quoted string. | 601 # PATH_PACKAGEPATH is already a quoted string. |
556 !if [echo PACKAGE_PATH>>$(CONFIG_VALUES) && echo $(PATH_PACKAGEPATH)>>$(CONFIG_VALUES)] | 602 !if [echo PACKAGE_PATH>>$(CONFIG_VALUES) && echo $(PATH_PACKAGEPATH)>>$(CONFIG_VALUES)] |
557 !endif | 603 !endif |
558 | 604 |
559 | 605 |
560 LINK_DEPENDENCY_ARGS = -Fe$@ -Fd$* $** -link -incremental:no | 606 LINK_DEPENDENCY_ARGS = -Fe$@ -Fd$* $** -link $(DEBUG_FLAGS_LINK) |
561 LINK_STANDARD_LIBRARY_ARGS = setargv.obj user32.lib wsock32.lib | 607 LINK_STANDARD_LIBRARY_ARGS = setargv.obj user32.lib wsock32.lib |
562 | 608 |
563 # Inferred rule | 609 # Inferred rule |
564 {$(LIB_SRC)}.c{$(LIB_SRC)}.exe : | 610 {$(LIB_SRC)}.c{$(LIB_SRC)}.exe : |
565 cd $(LIB_SRC) | 611 cd $(LIB_SRC) |
573 $(CCV) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES) $(CFLAGS) $(LINK_DEPENDENCY_ARGS) -stack:0x800000 $(LINK_STANDARD_LIBRARY_ARGS) | 619 $(CCV) -I$(LIB_SRC) -I$(SRC) $(LIB_SRC_DEFINES) $(CFLAGS) $(LINK_DEPENDENCY_ARGS) -stack:0x800000 $(LINK_STANDARD_LIBRARY_ARGS) |
574 cd $(NT) | 620 cd $(NT) |
575 | 621 |
576 $(LIB_SRC)/movemail.exe : $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS) | 622 $(LIB_SRC)/movemail.exe : $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS) |
577 | 623 |
624 # Minitar uses zlib so just use cdecl to simplify things | |
578 $(LIB_SRC)/minitar.exe : $(NT)/minitar.c | 625 $(LIB_SRC)/minitar.exe : $(NT)/minitar.c |
579 cd $(LIB_SRC) | 626 cd $(LIB_SRC) |
580 $(CCV) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_NO_LIB) $(LINK_DEPENDENCY_ARGS) "$(ZLIB_DIR)\zlib.lib" | 627 $(CCV) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) $(CFLAGS_CDECL_NO_LIB) $(LINK_DEPENDENCY_ARGS) "$(ZLIB_DIR)\zlib.lib" |
581 cd $(NT) | 628 cd $(NT) |
582 | 629 |
583 LIB_SRC_TOOLS = \ | 630 LIB_SRC_TOOLS = \ |
584 $(LIB_SRC)/etags.exe \ | 631 $(LIB_SRC)/etags.exe \ |
585 $(LIB_SRC)/hexl.exe \ | 632 $(LIB_SRC)/hexl.exe \ |
602 $(LIB_SRC_TOOLS) | 649 $(LIB_SRC_TOOLS) |
603 !endif | 650 !endif |
604 | 651 |
605 #------------------------------------------------------------------------------ | 652 #------------------------------------------------------------------------------ |
606 | 653 |
607 # dump-id.c file that contains the dump id | |
608 | |
609 $(SRC)\dump-id.c : $(LIB_SRC)/make-dump-id.exe | |
610 cd $(SRC) | |
611 $(LIB_SRC)\make-dump-id.exe | |
612 cd $(NT) | |
613 | |
614 #------------------------------------------------------------------------------ | |
615 | |
616 # LASTFILE Library | 654 # LASTFILE Library |
617 | 655 |
618 !if !$(USE_SYSTEM_MALLOC) || !$(USE_PORTABLE_DUMPER) | 656 !if !$(USE_SYSTEM_MALLOC) || !$(USE_PORTABLE_DUMPER) |
619 | 657 |
620 LASTFILE=$(OUTDIR)\lastfile.lib | 658 LASTFILE=$(OUTDIR)\lastfile.lib |
698 TEMACS_SRC=$(SRC) | 736 TEMACS_SRC=$(SRC) |
699 TEMACS_LIBS=$(LASTFILE) $(LWLIB) $(X_LIBS) $(MSW_LIBS) \ | 737 TEMACS_LIBS=$(LASTFILE) $(LWLIB) $(X_LIBS) $(MSW_LIBS) \ |
700 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \ | 738 oldnames.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib \ |
701 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \ | 739 shell32.lib wsock32.lib netapi32.lib winmm.lib winspool.lib ole32.lib \ |
702 mpr.lib uuid.lib imm32.lib $(LIBC_LIB) | 740 mpr.lib uuid.lib imm32.lib $(LIBC_LIB) |
703 TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS) -base:0x1000000\ | 741 TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS_LINK) -base:0x1000000\ |
704 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows\ | 742 -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:windows\ |
705 -pdb:$(TEMACS_DIR)\temacs.pdb -map:$(TEMACS_DIR)\temacs.map \ | 743 -pdb:$(TEMACS_DIR)\temacs.pdb -map:$(TEMACS_DIR)\temacs.map \ |
706 -heap:0x00100000 -nodefaultlib -incremental:no setargv.obj | 744 -heap:0x00100000 -nodefaultlib $(PROFILE_FLAGS) setargv.obj |
707 TEMACS_CPP_FLAGS=-c \ | 745 TEMACS_CPP_FLAGS_NO_CFLAGS=-c $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \ |
708 $(CFLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \ | |
709 -DEMACS_MAJOR_VERSION=$(emacs_major_version) \ | 746 -DEMACS_MAJOR_VERSION=$(emacs_major_version) \ |
710 -DEMACS_MINOR_VERSION=$(emacs_minor_version) \ | 747 -DEMACS_MINOR_VERSION=$(emacs_minor_version) \ |
711 $(EMACS_BETA_VERSION) \ | 748 $(EMACS_BETA_VERSION) \ |
712 $(EMACS_PATCH_LEVEL) \ | 749 $(EMACS_PATCH_LEVEL) \ |
713 -DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \ | 750 -DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \ |
714 -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \ | 751 -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \ |
715 -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\" | 752 -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\" |
753 TEMACS_CPP_FLAGS=$(CFLAGS) $(TEMACS_CPP_FLAGS_NO_CFLAGS) | |
754 TEMACS_CPP_CDECL_FLAGS=$(CFLAGS_CDECL) $(TEMACS_CPP_FLAGS_NO_CFLAGS) | |
716 | 755 |
717 !if $(HAVE_X_WINDOWS) | 756 !if $(HAVE_X_WINDOWS) |
718 TEMACS_X_OBJS=\ | 757 TEMACS_X_OBJS=\ |
719 $(OUTDIR)\balloon-x.obj \ | 758 $(OUTDIR)\balloon-x.obj \ |
720 $(OUTDIR)\balloon_help.obj \ | 759 $(OUTDIR)\balloon_help.obj \ |
748 $(OUTDIR)\glyphs-msw.obj \ | 787 $(OUTDIR)\glyphs-msw.obj \ |
749 $(OUTDIR)\gui-msw.obj \ | 788 $(OUTDIR)\gui-msw.obj \ |
750 $(OUTDIR)\objects-msw.obj \ | 789 $(OUTDIR)\objects-msw.obj \ |
751 $(OUTDIR)\redisplay-msw.obj \ | 790 $(OUTDIR)\redisplay-msw.obj \ |
752 $(OUTDIR)\select-msw.obj \ | 791 $(OUTDIR)\select-msw.obj \ |
753 $(MSW_C_DIRED_OBJ) \ | 792 $(OUTDIR)\dired-msw.obj \ |
754 $(MSW_MENUBAR_OBJ) \ | 793 $(MSW_MENUBAR_OBJ) \ |
755 $(MSW_SCROLLBAR_OBJ) \ | 794 $(MSW_SCROLLBAR_OBJ) \ |
756 $(MSW_TOOLBAR_OBJ) \ | 795 $(MSW_TOOLBAR_OBJ) \ |
757 $(MSW_DIALOG_OBJ) \ | 796 $(MSW_DIALOG_OBJ) \ |
758 $(MSW_GIF_OBJ) | 797 $(MSW_GIF_OBJ) |
851 $(OUTDIR)\intl.obj \ | 890 $(OUTDIR)\intl.obj \ |
852 $(OUTDIR)\intl-win32.obj \ | 891 $(OUTDIR)\intl-win32.obj \ |
853 $(OUTDIR)\intl-encap-win32.obj \ | 892 $(OUTDIR)\intl-encap-win32.obj \ |
854 $(OUTDIR)\intl-auto-encap-win32.obj \ | 893 $(OUTDIR)\intl-auto-encap-win32.obj \ |
855 $(OUTDIR)\keymap.obj \ | 894 $(OUTDIR)\keymap.obj \ |
895 $(OUTDIR)\libinterface.obj \ | |
856 $(OUTDIR)\line-number.obj \ | 896 $(OUTDIR)\line-number.obj \ |
857 $(OUTDIR)\lread.obj \ | 897 $(OUTDIR)\lread.obj \ |
858 $(OUTDIR)\lstream.obj \ | 898 $(OUTDIR)\lstream.obj \ |
859 $(OUTDIR)\macros.obj \ | 899 $(OUTDIR)\macros.obj \ |
860 $(OUTDIR)\marker.obj \ | 900 $(OUTDIR)\marker.obj \ |
861 $(OUTDIR)\md5.obj \ | 901 $(OUTDIR)\md5.obj \ |
862 $(OUTDIR)\minibuf.obj \ | 902 $(OUTDIR)\minibuf.obj \ |
903 # #### Leave the next one out when integrating my working ws | |
863 $(OUTDIR)\nt.obj \ | 904 $(OUTDIR)\nt.obj \ |
864 $(OUTDIR)\ntplay.obj \ | 905 $(OUTDIR)\ntplay.obj \ |
865 $(OUTDIR)\objects.obj \ | 906 $(OUTDIR)\objects.obj \ |
866 $(OUTDIR)\opaque.obj \ | 907 $(OUTDIR)\opaque.obj \ |
867 $(OUTDIR)\print.obj \ | 908 $(OUTDIR)\print.obj \ |
893 # Rules | 934 # Rules |
894 | 935 |
895 .SUFFIXES: | 936 .SUFFIXES: |
896 .SUFFIXES: .c .obj .texi .info | 937 .SUFFIXES: .c .obj .texi .info |
897 | 938 |
898 # nmake rule | 939 # nmake rule with batching: |
899 !if $(DEBUG_XEMACS) | 940 #{$(TEMACS_SRC)}.c{$(OUTDIR)}.obj: |
941 # echo $< >> $(OUTDIR)\listfile.tmp | |
942 | |
900 {$(TEMACS_SRC)}.c{$(OUTDIR)}.obj: | 943 {$(TEMACS_SRC)}.c{$(OUTDIR)}.obj: |
901 $(CCV) $(TEMACS_CPP_FLAGS) $< -Fo$@ -Fr$*.sbr -Fd$(OUTDIR)\temacs.pdb | 944 $(CCV) $(TEMACS_CPP_FLAGS) $< -Fo$@ $(BROWSERFLAGS) |
902 !else | 945 |
903 {$(TEMACS_SRC)}.c{$(OUTDIR)}.obj: | 946 # An explicit rule looks like this ($< works only in implicit rules): |
904 $(CCV) $(TEMACS_CPP_FLAGS) $< -Fo$@ | 947 # $(OUTDIR)\foo.obj: $(TEMACS_SRC)\foo.c |
905 !endif | 948 # $(CCV) $(TEMACS_CPP_FLAGS) $(TEMACS_SRC)\$(@B).c -Fo$@ $(BROWSERFLAGS) |
906 | 949 |
907 $(OUTDIR)\emacs.obj: $(XEMACS)\version.sh | 950 $(OUTDIR)\emacs.obj: $(XEMACS)\version.sh |
908 | 951 |
909 $(OUTDIR)\TopLevelEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c | 952 $(OUTDIR)\TopLevelEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c |
910 $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL $(TEMACS_SRC)\$(@B).c -Fo$@ | 953 $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL $(TEMACS_SRC)\$(@B).c -Fo$@ $(BROWSERFLAGS) |
911 | 954 |
912 $(OUTDIR)\TransientEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c | 955 $(OUTDIR)\TransientEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c |
913 $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TRANSIENT_EMACS_SHELL $(TEMACS_SRC)\$(@B).c -Fo$@ | 956 $(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TRANSIENT_EMACS_SHELL $(TEMACS_SRC)\$(@B).c -Fo$@ $(BROWSERFLAGS) |
957 | |
958 $(OUTDIR)\libinterface.obj: $(TEMACS_SRC)\libinterface.c | |
959 $(CCV) $(TEMACS_CPP_CDECL_FLAGS) $(TEMACS_SRC)\$(@B).c -Fo$@ $(BROWSERFLAGS) | |
914 | 960 |
915 #$(TEMACS_SRC)\Emacs.ad.h: $(XEMACS)\etc\Emacs.ad | 961 #$(TEMACS_SRC)\Emacs.ad.h: $(XEMACS)\etc\Emacs.ad |
916 # !"sed -f ad2c.sed < $(XEMACS)\etc\Emacs.ad > $(TEMACS_SRC)\Emacs.ad.h" | 962 # !"sed -f ad2c.sed < $(XEMACS)\etc\Emacs.ad > $(TEMACS_SRC)\Emacs.ad.h" |
917 | 963 |
918 #$(TEMACS_SRC)\paths.h: $(TEMACS_SRC)\paths.h.in | 964 #$(TEMACS_SRC)\paths.h: $(TEMACS_SRC)\paths.h.in |
919 # !"cd $(TEMACS_SRC); cp paths.h.in paths.h" | 965 # !"cd $(TEMACS_SRC); cp paths.h.in paths.h" |
920 | 966 |
921 $(TEMACS): $(TEMACS_INCLUDES) $(TEMACS_OBJS) $(OUTDIR)\xemacs.res | 967 create-list-file: |
922 !if $(DEBUG_XEMACS) | 968 @if exist $(OUTDIR)\listfile.tmp del $(OUTDIR)\listfile.tmp |
969 | |
970 compile-list-file: | |
971 cd $(OUTDIR) | |
972 @if exist listfile.tmp $(CC) $(TEMACS_CPP_FLAGS) @listfile.tmp $(BROWSERFLAGS) | |
973 | |
974 $(TEMACS_BROWSE): $(TEMACS_OBJS) | |
923 @dir /b/s $(OUTDIR)\*.sbr > $(OUTDIR)\bscmake.tmp | 975 @dir /b/s $(OUTDIR)\*.sbr > $(OUTDIR)\bscmake.tmp |
924 bscmake -nologo -o$(TEMACS_BROWSE) @$(OUTDIR)\bscmake.tmp | 976 bscmake -nologo -o$(TEMACS_BROWSE) @$(OUTDIR)\bscmake.tmp |
925 -$(DEL) $(OUTDIR)\bscmake.tmp | 977 -$(DEL) $(OUTDIR)\bscmake.tmp |
926 !endif | 978 |
979 # dump-id.c file that contains the dump id | |
980 | |
981 $(OUTDIR)\dump-id.obj : $(SRC)\dump-id.c | |
982 cd $(OUTDIR) | |
983 $(CCV) $(TEMACS_CPP_FLAGS) $(TEMACS_SRC)\$(@B).c $(BROWSERFLAGS) | |
984 | |
985 $(SRC)\dump-id.c : $(LIB_SRC)/make-dump-id.exe $(TEMACS_OBJS) | |
986 cd $(SRC) | |
987 $(LIB_SRC)\make-dump-id.exe | |
988 cd $(NT) | |
989 | |
927 !if $(USE_PORTABLE_DUMPER) | 990 !if $(USE_PORTABLE_DUMPER) |
928 @if exist $(SRC)\dump-id.c $(DEL) $(SRC)\dump-id.c | 991 TEMACS_DUMP_ID_OBJ = $(OUTDIR)\dump-id.obj |
929 # make a new dump id file. There is probably a better way to do this, but this works | 992 !else |
930 @if exist $(OUTDIR)\dump-id.obj $(DEL) $(OUTDIR)\dump-id.obj | 993 TEMACS_DUMP_ID_OBJ = |
931 nmake -nologo -f xemacs.mak OUTDIR=$(OUTDIR) $(OUTDIR)\dump-id.obj | 994 !endif |
995 | |
996 !if $(DEBUG_XEMACS) | |
997 $(TEMACS): $(TEMACS_OBJS) $(OUTDIR)\temacs.res $(TEMACS_BROWSE) $(TEMACS_DUMP_ID_OBJ) | |
998 !else | |
999 $(TEMACS): $(TEMACS_OBJS) $(OUTDIR)\temacs.res $(TEMACS_DUMP_ID_OBJ) | |
1000 !endif | |
1001 !if $(USE_PORTABLE_DUMPER) | |
1002 cd $(NT) | |
932 link.exe @<< | 1003 link.exe @<< |
933 $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj | 1004 $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(TEMACS_LIBS) $(TEMACS_DUMP_ID_OBJ) |
934 << | 1005 << |
935 !else | 1006 !else |
936 link.exe @<< | 1007 link.exe @<< |
937 $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) | 1008 $(TEMACS_LFLAGS) -out:$@ $(TEMACS_OBJS) $(OUTDIR)\temacs.res $(TEMACS_LIBS) |
938 << | 1009 << |
939 !endif | 1010 !endif |
940 | 1011 |
941 $(OUTDIR)\xemacs.res: xemacs.rc | 1012 $(OUTDIR)\temacs.res: $(NT)\xemacs.rc |
1013 cd $(NT) | |
942 rc -Fo$@ xemacs.rc | 1014 rc -Fo$@ xemacs.rc |
943 | 1015 |
944 | 1016 |
945 PROGNAME=$(SRC)\xemacs.exe | 1017 PROGNAME=$(TEMACS_DIR)\xemacs.exe |
946 BATCH = -no-packages -batch | 1018 BATCH = -no-packages -batch |
947 BATCH_PACKAGES = -vanilla -batch | 1019 BATCH_PACKAGES = -vanilla -batch |
948 TEMACS_BATCH = "$(LIB_SRC)\i" "$(TEMACS)" $(BATCH) | 1020 TEMACS_BATCH = "$(LIB_SRC)\i" "$(TEMACS)" $(BATCH) |
949 XEMACS_BATCH = "$(LIB_SRC)\i" "$(PROGNAME)" $(BATCH) | 1021 XEMACS_BATCH = "$(LIB_SRC)\i" "$(PROGNAME)" $(BATCH) |
950 XEMACS_BATCH_PACKAGES = "$(LIB_SRC)\i" "$(PROGNAME)" $(BATCH_PACKAGES) | 1022 XEMACS_BATCH_PACKAGES = "$(LIB_SRC)\i" "$(PROGNAME)" $(BATCH_PACKAGES) |
951 | 1023 |
952 | 1024 |
953 # Section handling automated tests starts here | 1025 # Section handling automated tests starts here |
954 | 1026 |
955 blddir=$(MAKEDIR:\=\\)\\.. | 1027 blddir=$(MAKEDIR:\=\\)\\.. |
956 temacs_loadup=$(TEMACS_BATCH) -l $(LISP)/loadup.el | 1028 temacs_loadup= |
957 dump_temacs = $(temacs_loadup) dump | 1029 dump_temacs = $(temacs_loadup) dump |
958 run_temacs = $(temacs_loadup) run-temacs | 1030 run_temacs = $(temacs_loadup) run-temacs |
959 ## We have automated tests!! | 1031 ## We have automated tests!! |
960 testdir=../tests/automated | 1032 testdir=../tests/automated |
961 batch_test_emacs=$(BATCH_PACKAGES) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir) | 1033 batch_test_emacs=$(BATCH_PACKAGES) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir) |
962 | 1034 |
963 # .PHONY: check check-temacs | 1035 # .PHONY: check check-temacs |
964 | 1036 |
965 check: | 1037 check: |
966 cd $(SRC) | 1038 cd $(TEMACS_DIR) |
967 $(PROGNAME) $(batch_test_emacs) | 1039 $(PROGNAME) $(batch_test_emacs) |
968 | 1040 |
969 check-temacs: | 1041 check-temacs: |
970 cd $(SRC) | 1042 cd $(TEMACS_DIR) |
971 $(run_temacs) $(batch_test_emacs) | 1043 $(TEMACS_BATCH) -l $(LISP)/loadup.el run-temacs $(batch_test_emacs) |
972 | 1044 |
973 # Section handling automated tests ends here | 1045 # Section handling automated tests ends here |
974 | 1046 |
975 # Section handling tags starts here | 1047 # Section handling tags starts here |
976 | 1048 |
1213 @!echo $(SRC)\$(**B).c >> $(OUTDIR)\make-docfile.tmp | 1285 @!echo $(SRC)\$(**B).c >> $(OUTDIR)\make-docfile.tmp |
1214 @echo Done. | 1286 @echo Done. |
1215 | 1287 |
1216 $(DOC): $(LIB_SRC)\make-docfile.exe make-docargs | 1288 $(DOC): $(LIB_SRC)\make-docfile.exe make-docargs |
1217 if exist $(DOC) $(DEL) $(DOC) | 1289 if exist $(DOC) $(DEL) $(DOC) |
1218 $(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages | 1290 cd $(TEMACS_DIR) |
1291 $(TEMACS_BATCH) -l $(LISP)\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages | |
1219 $(LIB_SRC)\make-docfile.exe -a $(DOC) @$(OUTDIR)\make-docfile.tmp | 1292 $(LIB_SRC)\make-docfile.exe -a $(DOC) @$(OUTDIR)\make-docfile.tmp |
1220 | 1293 |
1221 update-elc: | 1294 update-elc: |
1222 $(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\update-elc.el | 1295 cd $(TEMACS_DIR) |
1296 $(TEMACS_BATCH) -l $(LISP)\update-elc.el | |
1223 | 1297 |
1224 # This file is touched by update-elc.el when redumping is necessary. | 1298 # This file is touched by update-elc.el when redumping is necessary. |
1225 $(TEMACS_DIR)\NEEDTODUMP : | 1299 $(TEMACS_DIR)\NEEDTODUMP : |
1226 @echo >$(TEMACS_DIR)\NEEDTODUMP | 1300 @echo >$(TEMACS_DIR)\NEEDTODUMP |
1227 | 1301 |
1228 # This rule dumps xemacs and then possibly spawns sub-make if PURESPACE | 1302 # This rule dumps xemacs and then possibly spawns sub-make if PURESPACE |
1229 # requirements have changed. | 1303 # requirements have changed. |
1230 | 1304 |
1305 $(TEMACS_DIR)\SATISFIED: $(PROGNAME) | |
1306 | |
1231 $(PROGNAME) : $(TEMACS) $(TEMACS_DIR)\NEEDTODUMP | 1307 $(PROGNAME) : $(TEMACS) $(TEMACS_DIR)\NEEDTODUMP |
1232 @echo >$(TEMACS_DIR)\SATISFIED | 1308 @echo >$(TEMACS_DIR)\SATISFIED |
1233 cd $(TEMACS_DIR) | 1309 cd $(TEMACS_DIR) |
1234 $(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\loadup.el dump | 1310 $(TEMACS_BATCH) -l $(LISP)\loadup.el dump |
1235 !if $(USE_PORTABLE_DUMPER) | 1311 !if $(USE_PORTABLE_DUMPER) |
1236 rc -d INCLUDE_DUMP -Fo $(OUTDIR)\xemacs.res $(NT)\xemacs.rc | 1312 rc -d INCLUDE_DUMP -Fo $(OUTDIR)\xemacs.res $(NT)\xemacs.rc |
1237 # Make the resource section read/write since almost all of it is the dump | 1313 # Make the resource section read/write since almost all of it is the dump |
1238 # data which needs to be writable. This avoids having to copy it. | 1314 # data which needs to be writable. This avoids having to copy it. |
1239 link.exe @<< | 1315 link.exe @<< |
1240 $(TEMACS_LFLAGS) -section:.rsrc,rw -out:xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj | 1316 $(TEMACS_LFLAGS) -section:.rsrc,rw -out:xemacs.exe $(TEMACS_OBJS) $(OUTDIR)\xemacs.res $(TEMACS_LIBS) $(OUTDIR)\dump-id.obj |
1241 << | 1317 << |
1242 -$(DEL) $(TEMACS_DIR)\xemacs.dmp | 1318 -$(DEL) $(TEMACS_DIR)\xemacs.dmp |
1243 !endif | 1319 !endif |
1244 cd $(NT) | 1320 cd $(NT) |
1245 @if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@ | 1321 @if not exist $(TEMACS_DIR)\SATISFIED $(MAKE) /$(MAKEFLAGS) -nologo -f xemacs.mak $@ |
1246 #------------------------------------------------------------------------------ | 1322 #------------------------------------------------------------------------------ |
1247 | 1323 |
1248 # use this rule to build the complete system | 1324 # use this rule to build the complete system |
1249 all: installation $(OUTDIR)\nul $(LASTFILE) $(LWLIB) \ | 1325 all: installation $(OUTDIR)\nul $(LASTFILE) $(LWLIB) \ |
1250 $(LIB_SRC_TOOLS) $(TEMACS) update-elc $(DOC) $(PROGNAME) \ | 1326 $(LIB_SRC_TOOLS) $(TEMACS) update-elc $(DOC) $(PROGNAME) \ |
1261 @$(COPY) PlaceHolder "$(INSTALL_DIR)\lock\" | 1337 @$(COPY) PlaceHolder "$(INSTALL_DIR)\lock\" |
1262 -$(DEL) "$(INSTALL_DIR)\lock\PlaceHolder" | 1338 -$(DEL) "$(INSTALL_DIR)\lock\PlaceHolder" |
1263 @$(COPY) $(LIB_SRC)\*.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\" | 1339 @$(COPY) $(LIB_SRC)\*.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\" |
1264 @$(COPY) $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" | 1340 @$(COPY) $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" |
1265 @$(COPY) $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" | 1341 @$(COPY) $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" |
1266 @$(COPY) $(SRC)\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" | 1342 @$(COPY) $(TEMACS_DIR)\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" |
1267 @$(COPYDIR) $(XEMACS)\etc "$(INSTALL_DIR)\etc\" | 1343 @$(COPYDIR) $(XEMACS)\etc "$(INSTALL_DIR)\etc\" |
1268 @$(COPYDIR) $(XEMACS)\info "$(INSTALL_DIR)\info\" | 1344 @$(COPYDIR) $(XEMACS)\info "$(INSTALL_DIR)\info\" |
1269 @$(COPYDIR) $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\" | 1345 @$(COPYDIR) $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\" |
1270 @echo Making skeleton package tree in $(PACKAGE_PREFIX) ... | 1346 @echo Making skeleton package tree in $(PACKAGE_PREFIX) ... |
1271 @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\site-packages\" | 1347 @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\site-packages\" |
1281 -$(DEL) $(OUTDIR)\*.lib | 1357 -$(DEL) $(OUTDIR)\*.lib |
1282 -$(DEL) $(OUTDIR)\*.obj | 1358 -$(DEL) $(OUTDIR)\*.obj |
1283 -$(DEL) $(OUTDIR)\*.pdb | 1359 -$(DEL) $(OUTDIR)\*.pdb |
1284 -$(DEL) $(OUTDIR)\*.res | 1360 -$(DEL) $(OUTDIR)\*.res |
1285 -$(DEL) $(OUTDIR)\*.sbr | 1361 -$(DEL) $(OUTDIR)\*.sbr |
1286 -$(DEL) $(SRC)\*.exe | 1362 -$(DEL) $(TEMACS_DIR)\*.exe |
1287 -$(DEL) $(SRC)\*.map | 1363 -$(DEL) $(TEMACS_DIR)\*.map |
1288 -$(DEL) $(SRC)\*.bsc | 1364 -$(DEL) $(SRC)\*.bsc |
1289 -$(DEL) $(SRC)\*.pdb | 1365 -$(DEL) $(TEMACS_DIR)\*.pdb |
1290 -$(DEL) $(LIB_SRC)\*.exe | 1366 -$(DEL) $(LIB_SRC)\*.exe |
1291 -$(DEL) $(LIB_SRC)\*.obj | 1367 -$(DEL) $(LIB_SRC)\*.obj |
1292 -$(DEL) $(LIB_SRC)\*.pdb | 1368 -$(DEL) $(LIB_SRC)\*.pdb |
1293 -$(DEL) $(LIB_SRC)\*.res | 1369 -$(DEL) $(LIB_SRC)\*.res |
1294 | 1370 |
1332 -$(DEL) $(LISP)\term\*.elc | 1408 -$(DEL) $(LISP)\term\*.elc |
1333 | 1409 |
1334 realclean: distclean | 1410 realclean: distclean |
1335 | 1411 |
1336 versionclean: | 1412 versionclean: |
1337 -$(DEL) $(SRC)\xemacs.exe | 1413 -$(DEL) $(TEMACS_DIR)\xemacs.exe |
1338 -$(DEL) $(LIB_SRC)\DOC | 1414 -$(DEL) $(LIB_SRC)\DOC |
1339 | 1415 |
1340 #not sure about those wildcards. DOS wildcards are stupid compared to Unix, | 1416 #not sure about those wildcards. DOS wildcards are stupid compared to Unix, |
1341 #and could end up deleting *everything* instead of just backup files or | 1417 #and could end up deleting *everything* instead of just backup files or |
1342 #whatever. So just leave it at "realclean" | 1418 #whatever. So just leave it at "realclean" |
1368 OS: $(OS) | 1444 OS: $(OS) |
1369 !endif | 1445 !endif |
1370 | 1446 |
1371 XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename:"=\") configured for `$(EMACS_CONFIGURATION)'. | 1447 XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename:"=\") configured for `$(EMACS_CONFIGURATION)'. |
1372 | 1448 |
1449 Building XEmacs using \"$(MAKE:\=\\)\". | |
1450 Building XEmacs using make flags \"$(MAKEFLAGS)\". | |
1373 Building XEmacs in \"$(MAKEDIR:\=\\)\". | 1451 Building XEmacs in \"$(MAKEDIR:\=\\)\". |
1374 !if defined(CCV) | 1452 !if defined(CCV) |
1375 Using compiler \"$(CC) $(CFLAGS)\". | 1453 Using compiler \"$(CC) $(CFLAGS)\". |
1376 !endif | 1454 !endif |
1377 Installing XEmacs in \"$(INSTALL_DIR:\=\\)\". | 1455 Installing XEmacs in \"$(INSTALL_DIR:\=\\)\". |
1441 Compiling in support for widgets. | 1519 Compiling in support for widgets. |
1442 !endif | 1520 !endif |
1443 !if $(HAVE_NATIVE_SOUND) | 1521 !if $(HAVE_NATIVE_SOUND) |
1444 Compiling in support for native sounds. | 1522 Compiling in support for native sounds. |
1445 !endif | 1523 !endif |
1446 !if $(HAVE_MSW_C_DIRED) | |
1447 Compiling in fast dired implementation. | |
1448 !else | |
1449 -------------------------------------------------------------------- | |
1450 WARNING: Define HAVE_MSW_C_DIRED to be non-zero if you want XEmacs | |
1451 WARNING: to use C primitives to significantly speed up dired, at the | |
1452 WARNING: expense of an additional ~4KB of code. | |
1453 -------------------------------------------------------------------- | |
1454 !endif | |
1455 !if $(USE_UNION_TYPE) | 1524 !if $(USE_UNION_TYPE) |
1456 Using union type for Lisp object storage. | 1525 Using union type for Lisp object storage. |
1457 !endif | 1526 !endif |
1458 !if $(USE_PORTABLE_DUMPER) | 1527 !if $(USE_PORTABLE_DUMPER) |
1459 Using portable dumper. | 1528 Using portable dumper. |