Replace some cpp with autoconf.

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

2 files changed, 8 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e758fdb55f8..8fe14886af9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/Makefile.in b/src/Makefile.in
index 8c7c7a4e29e..c49543b181c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -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 \