mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-23 10:34:07 +00:00
Replace some cpp with autoconf.
* configure.in (OTHER_OBJ): New output variable. * src/Makefile.in (mallocobj): Remove. (otherobj): Simplify using @OTHER_OBJ@.
This commit is contained in:
parent
517d086b62
commit
7eb1ac33ed
@ -1,3 +1,7 @@
|
||||
2010-04-30 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* configure.in (OTHER_OBJ): New output variable.
|
||||
|
||||
2010-04-28 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* configure.in (CYGWIN_OBJ): New output variable.
|
||||
|
11
configure.in
11
configure.in
@ -2928,9 +2928,18 @@ if test "${REL_ALLOC}" = "yes" ; then
|
||||
buffer space.])
|
||||
fi
|
||||
|
||||
|
||||
OTHER_OBJ="\$(gmallocobj) \$(rallocobj)"
|
||||
if test "$opsys" = "cygwin"; then
|
||||
CYGWIN_OBJ="sheap.o"
|
||||
## Cygwin differs because of its unexec().
|
||||
OTHER_OBJ="$OTHER_OBJ lastfile.o"
|
||||
else
|
||||
CYGWIN_OBJ=
|
||||
test "$opsys" = "cygwin" && CYGWIN_OBJ="sheap.o"
|
||||
OTHER_OBJ="lastfile.o $OTHER_OBJ"
|
||||
fi
|
||||
AC_SUBST(CYGWIN_OBJ)
|
||||
AC_SUBST(OTHER_OBJ)
|
||||
|
||||
AH_TOP([/* GNU Emacs site configuration template file.
|
||||
Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005,
|
||||
|
@ -1,5 +1,8 @@
|
||||
2010-04-30 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* Makefile.in (mallocobj): Remove.
|
||||
(otherobj): Simplify using @OTHER_OBJ@.
|
||||
|
||||
* Makefile.in (dispnew.o, frame.o, fringe.o, font.o, fontset.o)
|
||||
(keyboard.o, window.o, xdisp.o, xfaces.o, menu.o):
|
||||
Don't bother making nsgui.h dependency platform-specific.
|
||||
|
@ -435,7 +435,6 @@ termcapobj = tparam.o
|
||||
|
||||
|
||||
#ifndef SYSTEM_MALLOC
|
||||
|
||||
#ifndef DOUG_LEA_MALLOC
|
||||
gmallocobj = gmalloc.o
|
||||
#endif
|
||||
@ -443,20 +442,12 @@ gmallocobj = gmalloc.o
|
||||
#ifdef REL_ALLOC
|
||||
rallocobj = ralloc.o
|
||||
#endif
|
||||
#endif /* !SYSTEM_MALLOC */
|
||||
|
||||
mallocobj = $(gmallocobj) $(rallocobj) vm-limit.o
|
||||
|
||||
#endif /* SYSTEM_MALLOC */
|
||||
|
||||
|
||||
/* define otherobj as list of object files that make-docfile
|
||||
should not be told about. */
|
||||
#ifdef CYGWIN
|
||||
/* Cygwin differs because of its unexec(). */
|
||||
otherobj= $(termcapobj) $(gmallocobj) $(rallocobj) lastfile.o vm-limit.o $(WIDGET_OBJ) $(LIBOBJS)
|
||||
#else
|
||||
otherobj= $(termcapobj) lastfile.o $(mallocobj) $(WIDGET_OBJ) $(LIBOBJS)
|
||||
#endif
|
||||
/* List of object files that make-docfile should not be told about. */
|
||||
/* OTHER_OBJ = $(gmallocobj) $(rallocobj), with trailing/leading
|
||||
lastfile.o on Cygwin/other. */
|
||||
otherobj= $(termcapobj) @OTHER_OBJ@ vm-limit.o $(WIDGET_OBJ) $(LIBOBJS)
|
||||
|
||||
#ifdef HAVE_MOUSE
|
||||
#define MOUSE_SUPPORT ${lispsource}mouse.elc \
|
||||
|
Loading…
Reference in New Issue
Block a user