Mercurial > hg > xemacs-beta
annotate modules/common/Makefile.common @ 5182:2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
lisp/ChangeLog addition:
2010-04-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el (fill, sort*, merge): Move these functions to fns.c.
(stable-sort): Make this docstring reflect the argument names used
in the #'sort* docstring.
* cl-macs.el (stable-sort): Make #'stable-sort exactly equivalent
to #'sort* in compiled code.
* bytecomp.el (byte-compile-maybe-add-*):
New macro, for functions like #'sort and #'mapcar that, to be
strictly compatible, should only take two args, but in our
implementation can take more, because they're aliases of #'sort*
and #'mapcar*.
(byte-compile-mapcar, byte-compile-sort, byte-compile-fillarray):
Use this new macro.
(map-into): Add a byte-compile method for #'map-into in passing.
* apropos.el (apropos-print): Use #'sort* with a :key argument,
now it's in C.
* compat.el (extent-at): Ditto.
* register.el (list-registers): Ditto.
* package-ui.el (pui-list-packages): Ditto.
* help.el (sorted-key-descriptions): Ditto.
src/ChangeLog addition:
2010-03-31 Aidan Kehoe <kehoea@parhasard.net>
* fns.c (STRING_DATA_TO_OBJECT_ARRAY)
(BIT_VECTOR_TO_OBJECT_ARRAY, c_merge_predicate_key)
(c_merge_predicate_nokey, list_merge, array_merge)
(list_array_merge_into_list, list_list_merge_into_array)
(list_array_merge_into_array, CHECK_KEY_ARGUMENT, Fmerge)
(list_sort, array_sort, FsortX):
Move #'sort*, #'fill, #'merge from cl-seq.el to C, extending the
implementations of Fsort, Ffillarray, and merge() to do so.
* keymap.c (keymap_submaps, map_keymap_sort_predicate)
(describe_map_sort_predicate):
Change the calling semantics of the C sort predicates to return a
non-nil Lisp object if the first argument is less than the second,
rather than C integers.
* fontcolor-msw.c (sort_font_list_function):
* fileio.c (build_annotations):
* dired.c (Fdirectory_files):
* abbrev.c (Finsert_abbrev_table_description):
Call list_sort instead of Fsort, list_merge instead of merge() in
these functions.
man/ChangeLog addition:
2010-04-01 Aidan Kehoe <kehoea@parhasard.net>
* lispref/lists.texi (Rearrangement):
Update the documentation of #'sort here, now that it accepts any
type of sequence and the KEY keyword argument. (Though this is
probably now the wrong place for this function, given that.)
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Thu, 01 Apr 2010 20:22:50 +0100 |
| parents | c356806cc933 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 1083 | 1 ## Common Makefile section for modules in XEmacs. |
| 2 ## Copyright (C) 2002 Jerry James. | |
| 3062 | 3 ## Copyright (C) 2005 Ben Wing. |
| 1083 | 4 |
| 5 ## This file is part of XEmacs. | |
| 6 | |
| 7 ## XEmacs is free software; you can redistribute it and/or modify it | |
| 8 ## under the terms of the GNU General Public License as published by the | |
| 9 ## Free Software Foundation; either version 2, or (at your option) any | |
| 10 ## later version. | |
| 11 | |
| 12 ## XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 ## for more details. | |
| 16 | |
| 17 ## You should have received a copy of the GNU General Public License | |
| 18 ## along with XEmacs; see the file COPYING. If not, write to | |
| 19 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 ## Boston, MA 02111-1307, USA. | |
| 21 | |
| 22 ## Synched up with: Not in FSF. | |
| 23 | |
| 24 ## This is more complicated than would normally be the case, as this makefile | |
| 25 ## has been tailored to work both inside and independently of the XEmacs | |
| 26 ## source tree, and to support both module and non-module building inside the | |
| 27 ## source tree. | |
| 28 | |
| 1111 | 29 ## Note: This will be appended to the individual module Makefiles by configure. |
| 30 | |
| 1632 | 31 #define NOT_C_CODE |
| 32 #include "../../src/config.h" | |
| 33 | |
| 1083 | 34 SHELL=/bin/sh |
| 35 RM=rm -f | |
| 36 PROGNAME=@PROGNAME@ | |
| 2377 | 37 CFLAGS=@XE_CFLAGS@ |
| 1083 | 38 INSTALL=@INSTALL@ |
| 39 version=@version@ | |
| 40 prefix=@prefix@ | |
| 41 exec_prefix=@exec_prefix@ | |
| 42 libdir=@libdir@ | |
| 43 instvardir=@instvardir@ | |
| 44 configuration=@configuration@ | |
| 45 moduledir=@moduledir@ | |
| 46 with_modules=@with_modules@ | |
| 47 | |
| 48 srcdir=@srcdir@ | |
| 49 VPATH=@srcdir@ | |
| 50 | |
| 1522 | 51 SRC_SRCS=$(SRCS:%=@srcdir@/%) |
| 1490 | 52 OBJS=$(SRCS:.c=.o) |
| 53 | |
| 1252 | 54 MODCC=@MOD_CC@ |
| 1083 | 55 MODARCHDIR=@MODARCHDIR@ |
| 56 MAKE_DOCFILE=@MAKE_DOCFILE@ | |
| 57 MODCFLAGS=@MODCFLAGS@ | |
| 58 INSTALLPATH=@INSTALLPATH@ | |
| 59 INSTALL_PROGRAM=@MOD_INSTALL_PROGRAM@ | |
| 60 OBJECT_TO_BUILD=@OBJECT_TO_BUILD@ | |
| 1650 | 61 LIBSTDCPP=@LIBSTDCPP@ |
|
4879
c356806cc933
fix compile errors when --with-msw=no
Ben Wing <ben@xemacs.org>
parents:
3083
diff
changeset
|
62 #ifdef WIN32_ANY |
| 1632 | 63 IMPORT_LIB=../../src/xemacs-import.a |
| 64 #endif | |
| 1083 | 65 |
| 3062 | 66 .PHONY: install |
| 1083 | 67 all: $(OBJECT_TO_BUILD) |
| 68 | |
| 69 .c.o: | |
| 1252 | 70 $(MODCC) $(MODCFLAGS) -c $< |
| 1083 | 71 |
| 1632 | 72 $(MODNAME).ell: $(OBJS) $(MODNAME)_i.o $(IMPORT_LIB) |
| 1489 | 73 $(MODCC) --mode=link --mode=verbose --mod-output=$@ \ |
| 1650 | 74 $(OBJS) $(MODNAME)_i.o $(IMPORT_LIB) $(LDFLAGS) $(LIBSTDCPP) |
| 1083 | 75 |
| 76 $(MODNAME)_i.c: $(SRCS) | |
| 1252 | 77 ELLMAKEDOC=$(MAKE_DOCFILE) $(MODCC) --mode=init --mod-output=$@ \ |
| 1083 | 78 --mod-name=$(MODNAME) --mod-version=$(MODVER) \ |
| 79 --mod-title=$(MODTITLE) $(SRC_SRCS) | |
| 80 | |
| 3062 | 81 .PHONY: mostlyclean clean distclean realclean extraclean |
| 82 .PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig | |
| 83 mostlyclean: | |
| 3083 | 84 -$(RM) $(OBJS) $(MODNAME)_i.* core |
| 3062 | 85 clean: mostlyclean |
| 3083 | 86 -$(RM) $(MODNAME).ell |
| 3062 | 87 distclean-noconfig: clean |
| 3083 | 88 -$(RM) config.* TAGS |
| 3062 | 89 ## This is used in making a distribution. |
| 90 ## Do not use it on development directories! | |
| 91 distclean: distclean-noconfig | |
| 3083 | 92 -$(RM) GNUmakefile Makefile Makefile.in configure |
| 3062 | 93 realclean-noconfig: distclean-noconfig |
| 94 realclean: distclean | |
| 95 extraclean-noconfig: realclean-noconfig | |
| 3083 | 96 -$(RM) *~ \#* |
| 3062 | 97 extraclean: realclean |
| 3083 | 98 -$(RM) *~ \#* |
| 1083 | 99 |
| 100 install: $(OBJECT_TO_BUILD) | |
| 101 $(INSTALL_PROGRAM) $< $(INSTALLPATH) | |
| 3062 | 102 |
| 103 ## | |
| 104 ## Local Variables: | |
| 105 ## mode: makefile | |
| 106 ## End: | |
| 107 ## |
