Mercurial > hg > xemacs-beta
view modules/common/Makefile.common @ 4745:0c54de4c4b9d
Resolve the unregistered-CCL-programs-get-garbage-collected problem correctly
src/ChangeLog addition:
2009-11-15 Aidan Kehoe <kehoea@parhasard.net>
* mule-ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Assert that we always
have a symbol in this macro.
(setup_ccl_program): Ensure we're not allocating unreachable
memory in this function; all symbols must have been resolved in a
given CCL program before this function is called.
(find_ccl_program): New function, return a CCL program with all
its symbols resolved if it is valid (possibly allocating memory),
Qnil otherwise.
(get_ccl_program): New function, exported to other files; call
find_ccl_program, and error if it gives nil.
(Fccl_program_p): Call find_ccl_program from this function instead
of implementing the bulk of it here.
(Fccl_execute): Call get_ccl_program instead of implementing the
bulk of it here.
(Fccl_execute_on_string): Ditto.
* mule-ccl.h (Vfont_ccl_encoder_alist): Remove this declaration,
it hasn't been used in years.
(get_ccl_program): Declare this function.
* mule-coding.c (ccl_putprop): Use get_ccl_program on any
specified encode or decode CCL program property.
(fixed_width_putprop): Ditto.
* mule-charset.c (Fmake_charset): Use get_ccl_program on any
specified ccl-program.
(Fset_charset_ccl_program): Ditto.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 15 Nov 2009 16:53:14 +0000 |
parents | 193188e494b2 |
children | c356806cc933 |
line wrap: on
line source
## Common Makefile section for modules in XEmacs. ## Copyright (C) 2002 Jerry James. ## Copyright (C) 2005 Ben Wing. ## This file is part of XEmacs. ## XEmacs is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by the ## Free Software Foundation; either version 2, or (at your option) any ## later version. ## XEmacs is distributed in the hope that it will be useful, but WITHOUT ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## for more details. ## You should have received a copy of the GNU General Public License ## along with XEmacs; see the file COPYING. If not, write to ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ## Boston, MA 02111-1307, USA. ## Synched up with: Not in FSF. ## This is more complicated than would normally be the case, as this makefile ## has been tailored to work both inside and independently of the XEmacs ## source tree, and to support both module and non-module building inside the ## source tree. ## Note: This will be appended to the individual module Makefiles by configure. #define NOT_C_CODE #include "../../src/config.h" SHELL=/bin/sh RM=rm -f PROGNAME=@PROGNAME@ CFLAGS=@XE_CFLAGS@ INSTALL=@INSTALL@ version=@version@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ instvardir=@instvardir@ configuration=@configuration@ moduledir=@moduledir@ with_modules=@with_modules@ srcdir=@srcdir@ VPATH=@srcdir@ SRC_SRCS=$(SRCS:%=@srcdir@/%) OBJS=$(SRCS:.c=.o) MODCC=@MOD_CC@ MODARCHDIR=@MODARCHDIR@ MAKE_DOCFILE=@MAKE_DOCFILE@ MODCFLAGS=@MODCFLAGS@ INSTALLPATH=@INSTALLPATH@ INSTALL_PROGRAM=@MOD_INSTALL_PROGRAM@ OBJECT_TO_BUILD=@OBJECT_TO_BUILD@ LIBSTDCPP=@LIBSTDCPP@ #ifdef HAVE_MS_WINDOWS IMPORT_LIB=../../src/xemacs-import.a #endif .PHONY: install all: $(OBJECT_TO_BUILD) .c.o: $(MODCC) $(MODCFLAGS) -c $< $(MODNAME).ell: $(OBJS) $(MODNAME)_i.o $(IMPORT_LIB) $(MODCC) --mode=link --mode=verbose --mod-output=$@ \ $(OBJS) $(MODNAME)_i.o $(IMPORT_LIB) $(LDFLAGS) $(LIBSTDCPP) $(MODNAME)_i.c: $(SRCS) ELLMAKEDOC=$(MAKE_DOCFILE) $(MODCC) --mode=init --mod-output=$@ \ --mod-name=$(MODNAME) --mod-version=$(MODVER) \ --mod-title=$(MODTITLE) $(SRC_SRCS) .PHONY: mostlyclean clean distclean realclean extraclean .PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig mostlyclean: -$(RM) $(OBJS) $(MODNAME)_i.* core clean: mostlyclean -$(RM) $(MODNAME).ell distclean-noconfig: clean -$(RM) config.* TAGS ## This is used in making a distribution. ## Do not use it on development directories! distclean: distclean-noconfig -$(RM) GNUmakefile Makefile Makefile.in configure realclean-noconfig: distclean-noconfig realclean: distclean extraclean-noconfig: realclean-noconfig -$(RM) *~ \#* extraclean: realclean -$(RM) *~ \#* install: $(OBJECT_TO_BUILD) $(INSTALL_PROGRAM) $< $(INSTALLPATH) ## ## Local Variables: ## mode: makefile ## End: ##