Mercurial > emacs

diff src/Makefile.in @ 108176:e6f59a2ba110

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Hopefully fix bug#6065. * configure.in (OTHER_OBJ): Always include vm-limit.o on Cygwin. Elsewhere, maybe include it. * src/Makefile.in (vmlimitobj) [!SYSTEM_MALLOC]: New variable. (OTHER_OBJ): Define as a separate variable, for clarity. * configure: Regenerate.
author Glenn Morris <rgm@gnu.org>
date Fri, 30 Apr 2010 09:37:01 -0700
parents c9d0b6bfe74e
children 804e9ced8374
line wrap: on
line diff
--- a/src/Makefile.in	Fri Apr 30 15:50:34 2010 +0200
+++ b/src/Makefile.in	Fri Apr 30 09:37:01 2010 -0700
@@ -420,12 +420,14 @@
 #ifdef REL_ALLOC
 rallocobj = ralloc.o
 #endif
+
+vmlimitobj = vm-limit.o
 #endif /* !SYSTEM_MALLOC */
 
+OTHER_OBJ=@OTHER_OBJ@
+
 /* 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)
+otherobj= $(termcapobj) $(OTHER_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
 
 #ifdef HAVE_MOUSE
 #define MOUSE_SUPPORT ${lispsource}mouse.elc \