annotate nt/xpm.mak @ 1315:70921960b980

[xemacs-hg @ 2003-02-20 08:19:28 by ben] check in makefile fixes et al Makefile.in.in: Major surgery. Move all stuff related to building anything in the src/ directory into src/. Simplify the dependencies -- everything in src/ is dependent on the single entry `src' in MAKE_SUBDIRS. Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. mule/mule-msw-init.el: Removed. Delete this file. mule/mule-win32-init.el: New file, with stuff from mule-msw-init.el -- not just for MS Windows native, boys and girls! bytecomp.el: Change code inserted to catch trying to load a Mule-only .elc file in a non-Mule XEmacs. Formerly you got the rather cryptic "The required feature `mule' cannot be provided". Now you get "Loading this file requires Mule support". finder.el: Remove dependency on which directory this function is invoked from. update-elc.el: Don't mess around with ../src/BYTECOMPILE_CHANGE. Now that Makefile.in.in and xemacs.mak are in sync, both of them use NEEDTODUMP and the other one isn't used. dumped-lisp.el: Rewrite in terms of `list' and `nconc' instead of assemble-list, so we can have arbitrary forms, not just `when-feature'. very-early-lisp.el: Nuke this file. finder-inf.el, packages.el, update-elc.el, update-elc-2.el, loadup.el, make-docfile.el: Eliminate references to very-early-lisp. msw-glyphs.el: Comment clarification. xemacs.mak: Add macros DO_TEMACS, DO_XEMACS, and a few others; this macro section is now completely in sync with src/Makefile.in.in. Copy check-features, load-shadows, and rebuilding finder-inf.el from src/Makefile.in.in. The main build/dump/recompile process is now synchronized with src/Makefile.in.in. Change `WARNING' to `NOTE' and `error checking' to `error-checking' TO avoid tripping faux warnings and errors in the VC++ IDE. Makefile.in.in: Major surgery. Move all stuff related to building anything in the src/ directory from top-level Makefile.in.in to here. Simplify the dependencies. Rearrange into logical subsections. Synchronize the main compile/dump/build-elcs section with xemacs.mak, which is already clean and in good working order. Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. Add additional levels of macros \(e.g. DO_TEMACS, DO_XEMACS, TEMACS_BATCH, XEMACS_BATCH, XEMACS_BATCH_PACKAGES) to factor out duplicated stuff. Clean up handling of "HEAP_IN_DATA" (Cygwin) so it doesn't need to ignore the return value from dumping. Add .NO_PARALLEL since various aspects of building and dumping must be serialized but do not always have dependencies between them (this is impossible in some cases). Everything related to src/ now gets built in one pass in this directory by just running `make' (except the Makefiles themselves and config.h, paths.h, Emacs.ad.h, and other generated .h files). console.c: Update list of possibly valid console types. emacs.c: Rationalize the specifying and handling of the type of the first frame. This was originally prompted by a workspace in which I got GTK to compile under C++ and in the process fixed it so it could coexist with X in the same build -- hence, a combined TTY/X/MS-Windows/GTK build is now possible under Cygwin. (However, you can't simultaneously *display* more than one kind of device connection -- but getting that to work is not that difficult. Perhaps a project for a bored grad student. I (ben) would do it but don't see the use.) To make sense of this, I added new switches that can be used to specifically indicate the window system: -x [aka --use-x], -tty \[aka --use-tty], -msw [aka --use-ms-windows], -gtk [aka --use-gtk], and -gnome [aka --use-gnome, same as --use-gtk]. -nw continues as an alias for -tty. When none have been given, XEmacs checks for other parameters implying particular device types (-t -> tty, -display -> x [or should it have same treatment as DISPLAY below?]), and has ad-hoc logic afterwards: if env var DISPLAY is set, use x (or gtk? perhaps should check whether gnome is running), else MS Windows if it exsits, else TTY if it exists, else stream, and you must be running in batch mode. This also fixes an existing bug whereby compiling with no x, no mswin, no tty, when running non- interactively (e.g. to dump) I get "sorry, must have TTY support". emacs.c: Turn on Vstack_trace_on_error so that errors are debuggable even when occurring extremely early in reinitialization. emacs.c: Try to make sure that the user can see message output under Windows (i.e. it doesn't just disappear right away) regardless of when it occurs, e.g. in the middle of creating the first frame. emacs.c: Define new function `emacs-run-status', indicating whether XEmacs is noninteractive or interactive, whether raw, post-dump/pdump-load or run-temacs, whether we are dumping, whether pdump is in effect. event-stream.c: It's "mommas are fat", not "momas are fat". Fix other typo. event-stream.c: Conditionalize in_menu_callback check on HAVE_MENUBARS, because it won't exist on w/o menubar support, lisp.h: More hackery on RETURN_NOT_REACHED. Cygwin v3.2 DOES complain here if RETURN_NOT_REACHED() is blank, as it is for GCC 2.5+. So make it blank only for GCC 2.5 through 2.999999999999999. Declare Vstack_trace_on_error. profile.c: Need to include "profile.h" to fix warnings. sheap.c: Don't fatal() when need to rerun Make, just stderr_out() and exit(0). That way we can distinguish between a dumping failing expectedly (due to lack of stack space, triggering another dump) and unexpectedly, in which case, we want to stop building. (or go on, if -K is given) syntax.c, syntax.h: Use ints where they belong, and enum syntaxcode's where they belong, and fix warnings thereby. syntax.h: Fix crash caused by an edge condition in the syntax-cache macros. text.h: Spacing fixes. xmotif.h: New file, to get around shadowing warnings. EmacsManager.c, event-Xt.c, glyphs-x.c, gui-x.c, input-method-motif.c, xmmanagerp.h, xmprimitivep.h: Include xmotif.h. alloc.c: Conditionalize in_malloc on ERROR_CHECK_MALLOC. config.h.in, file-coding.h, fileio.c, getloadavg.c, select-x.c, signal.c, sysdep.c, sysfile.h, systime.h, text.c, unicode.c: Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead. Replace defined (WIN32_NATIVE) || defined (CYGWIN) with WIN32_ANY. lisp.h: More futile attempts to walk and chew gum at the same time when dealing with subr's that don't return.
author ben
date Thu, 20 Feb 2003 08:19:44 +0000
parents ece8c2170578
children 5274591ce707
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
1 #
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
2 # XPM Makefile for Microsoft NMAKE without X libraries
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
3 #
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
4 !if !defined(DEBUG)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
5 !if defined(DEBUG_XEMACS)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
6 DEBUG=$(DEBUG_XEMACS)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
7 !else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
8 DEBUG=0
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
9 !endif
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
10 !endif
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
11
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
12 !if !defined(USE_CRTDLL)
817
ece8c2170578 [xemacs-hg @ 2002-04-23 00:44:29 by jhar]
jhar
parents: 398
diff changeset
13 USE_CRTDLL=1
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
14 !endif
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
15
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
16 !if $(DEBUG)
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
17 OPT=-Od -Zi
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
18 LINK_DEBUG=-debug
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
19 !else
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
20 OPT=-Ox
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
21 !endif
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
22
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
23 !if $(USE_CRTDLL)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
24 !if $(DEBUG)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
25 C_LIBFLAG=-MDd
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
26 !else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
27 C_LIBFLAG=-MD
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
28 !endif
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
29 !else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
30 !if $(DEBUG)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
31 C_LIBFLAG=-MLd
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
32 !else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
33 C_LIBFLAG=-ML
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
34 !endif
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
35 !endif
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
36
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
37 WARN_CPP_FLAGS = -W3
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
38
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
39 CC=cl
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
40 CFLAGS=-nologo -DFOR_MSW $(C_LIBFLAG) $(WARN_CPP_FLAGS) \
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
41 $(OPT) $(INCLUDES) -c
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
42
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
43 OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
44 WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
45 CrIFrBuf.obj CrBufFrI.obj \
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
46 RdFToDat.obj WrFFrDat.obj \
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
47 Attrib.obj Image.obj Info.obj RdFToBuf.obj WrFFrBuf.obj \
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
48 simx.obj
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
49
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
50 # nmake rule
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
51
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
52 .SUFFIXES:
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
53 .SUFFIXES: .c
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
54
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
55 .c.obj::
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
56 $(CC) $(CFLAGS) $<
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
57
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
58
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
59 # targets
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
60
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
61 all: ..\X11\xpm.h Xpm.lib
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
62
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
63 ..\X11\xpm.h: ..\X11\NUL xpm.h
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
64 copy xpm.h ..\X11
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
65
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
66 ..\X11\NUL:
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
67 mkdir ..\X11
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
68
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
69 Xpm.lib: $(OBJS)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
70 lib -nologo -out:$@ $(OBJS)