annotate nt/xpm.mak @ 4539:061e030e3270

Fix some bugs in load-history construction, built-in symbol file names. lib-src/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * make-docfile.c (main): Allow more than one -d argument, followed by a directory to change to. (put_filename): Don't strip directory information; with previous change, allows retrieval of Lisp function and variable origin files from #'built-in-symbol-file relative to lisp-directory. (scan_lisp_file): Don't add an extraneous newline after the file name, put_filename has added the newline already. lisp/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * loadup.el (load-history): Add the contents of current-load-list to load-history before clearing it. Move the variable declarations earlier in the file to a format understood by make-docfile.c. * custom.el (custom-declare-variable): Add the variable's symbol to the current file's load history entry correctly, don't use a cons. Eliminate a comment that we don't need to worry about, we don't need to check the `initialized' C variable in Lisp. * bytecomp.el (byte-compile-output-file-form): Merge Andreas Schwab's pre-GPLv3 GNU change of 19970831 here; treat #'custom-declare-variable correctly, generating the docstrings in a format understood by make-docfile.c. * loadhist.el (symbol-file): Correct behaviour for checking autoloaded macros and functions when supplied with a TYPE argument. Accept fully-qualified paths from #'built-in-symbol-file; if a path is not fully-qualified, return it relative to lisp-directory if the filename corresponds to a Lisp file, and relative to (concat source-directory "/src/") otherwise. * make-docfile.el (preloaded-file-list): Rationalise some let bindings a little. Use the "-d" argument to make-docfile.c to supply Lisp paths relative to lisp-directory, not absolutely. Add in loadup.el explicitly to the list of files to be processed by make-docfile.c--it doesn't make sense to add it to preloaded-file-list, since that is used for purposes of byte-compilation too. src/ChangeLog addition: 2008-12-27 Aidan Kehoe <kehoea@parhasard.net> * doc.c (Fbuilt_in_symbol_file): Return a subr's filename immediately if we've found it. Check for compiled function and compiled macro docstrings in DOC too, and return them if they exist. The branch of the if statement focused on functions may have executed, but we may still want to check variable bindings; an else clause isn't appropriate.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 27 Dec 2008 14:05:50 +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)