diff src/Makefile.in @ 108171:06a18c2b3272

Replace some cpp with autoconf. * configure.in (OTHER_OBJ): New output variable. * src/Makefile.in (mallocobj): Remove. (otherobj): Simplify using @OTHER_OBJ@.

--- 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 \