Mercurial > emacs
changeset 108171:06a18c2b3272
Replace some cpp with autoconf.
* configure.in (OTHER_OBJ): New output variable.
* src/Makefile.in (mallocobj): Remove.
(otherobj): Simplify using @OTHER_OBJ@.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 29 Apr 2010 18:36:42 -0700 |
| parents | 95d0ee272263 |
| children | c9d0b6bfe74e |
| files | ChangeLog configure.in src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 22 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Apr 29 18:27:33 2010 -0700 +++ b/ChangeLog Thu Apr 29 18:36:42 2010 -0700 @@ -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.
--- a/configure.in Thu Apr 29 18:27:33 2010 -0700 +++ b/configure.in Thu Apr 29 18:36:42 2010 -0700 @@ -2928,9 +2928,18 @@ 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,
--- a/src/ChangeLog Thu Apr 29 18:27:33 2010 -0700 +++ b/src/ChangeLog Thu Apr 29 18:36:42 2010 -0700 @@ -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.
--- a/src/Makefile.in Thu Apr 29 18:27:33 2010 -0700 +++ b/src/Makefile.in Thu Apr 29 18:36:42 2010 -0700 @@ -435,7 +435,6 @@ #ifndef SYSTEM_MALLOC - #ifndef DOUG_LEA_MALLOC gmallocobj = gmalloc.o #endif @@ -443,20 +442,12 @@ #ifdef REL_ALLOC rallocobj = ralloc.o #endif - -mallocobj = $(gmallocobj) $(rallocobj) vm-limit.o - -#endif /* SYSTEM_MALLOC */ - +#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 \