Replace some msdos cpp.

* src/Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it.
(MSDOS_X_OBJ): New variable.
(MSDOS_SUPPORT_REAL): New constant.
(MSDOS_SUPPORT): Set as a variable, not with cpp.
(obj): Use MSDOS_X_OBJ.
(lisp): Use MSDOS_SUPPORT as a variable.

* msdos/sed1v2.inp (MSDOS_OBJ): Edit to dosfns.o msdos.o.
(MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL).
* msdos/sed1x.inp (MSDOS_X_OBJ): Edit to w16select.o termcap.o.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index e7926551636be55352c8bfe9382cd4a22033532d..780ec198d473d54b7fd43b46f66526d2a6a33b46 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,9 @@
 2010-05-14  Glenn Morris  <rgm@gnu.org>
 
+       * sed1v2.inp (MSDOS_OBJ): Edit to dosfns.o msdos.o.
+       (MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL).
+       * sed1x.inp (MSDOS_X_OBJ): Edit to w16select.o termcap.o.
+
        * sed2x.inp (HAVE_WINDOW_SYSTEM): Define.
        * sed1x.inp (TOOLTIP_SUPPORT): Edit to ${lispsource}tooltip.elc.
        (WINDOW_SUPPORT): Edit to $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT).

diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 12aaa33665a0f53d3b6cac9c477c82ccb3385f5b..5ebaba06f60902338b2ea7e3c57f644989ba7d7d 100644 (file)
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -89,6 +89,8 @@ s/\.h\.in/.h-in/
 /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@//
 /^WIDGET_OBJ *=/s/@WIDGET_OBJ@//
 /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@//
+/^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o/
+/^MSDOS_SUPPORT *=/s/= */= $(MSDOS_SUPPORT_REAL)/
 /^NS_OBJ *=/s/@NS_OBJ@//
 /^NS_SUPPORT *=/s/@NS_SUPPORT@//
 /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@//

diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index 3f69526e6fc75b6c1819117148bc1edda38b4736..bcdb0fec0ed7da4be986f256175f883aa2b1c9e5 100644 (file)
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -8,6 +8,7 @@ s/DOC/DOC-X/g
 /^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}!
 /^LIBX_OTHER *=/s!@LIBX_OTHER@!${LIBXT} ${LIBX_EXTRA}!
 /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
+/^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o!
 /^TOOLTIP_SUPPORT *=/s!= *!= ${lispsource}tooltip.elc!
 /^WINDOW_SUPPORT *=/s!= *!= $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)!
 /^temacs *:/s!OLDXMENU!LIBXMENU!

diff --git a/src/ChangeLog b/src/ChangeLog
index cfa1d1e240393a863906b08566d70dfeaa8eeaae..164cfbf6edb6dc66fb040a733c8bc47bea1cd10b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2010-05-14  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it.
+       (MSDOS_X_OBJ): New variable.
+       (MSDOS_SUPPORT_REAL): New constant.
+       (MSDOS_SUPPORT): Set as a variable, not with cpp.
+       (obj): Use MSDOS_X_OBJ.
+       (lisp): Use MSDOS_SUPPORT as a variable.
+
        * Makefile.in (REAL_MOUSE_SUPPORT): New constant.
        (GPM_MOUSE_SUPPORT): Now it's a constant.
        (MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): Set with configure,

diff --git a/src/Makefile.in b/src/Makefile.in
index 7955420ee499efe918b7ca0d643186aaa7ffd2f4..4d2481af924a57157bc39fce1dd3c4c64ad191c0 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -184,6 +184,16 @@ WIDGET_OBJ=@WIDGET_OBJ@
 ## sheap.o if CYGWIN, otherwise empty.
 CYGWIN_OBJ=@CYGWIN_OBJ@
 
+## dosfns.o msdos.o if MSDOS.
+MSDOS_OBJ =
+## w16select.o termcap.o if MSDOS && HAVE_X_WINDOWS.
+MSDOS_X_OBJ =
+MSDOS_SUPPORT_REAL = ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
+ ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \
+ ${lispsource}term/internal.elc ${lispsource}term/pc-win.elc
+## $MSDOS_SUPPORT_REAL if MSDOS.
+MSDOS_SUPPORT = 
+
 NS_OBJ=@NS_OBJ@
 NS_SUPPORT=@NS_SUPPORT@
 ## Next two only set if NS_IMPL_GNUSTEP.
@@ -340,15 +350,6 @@ LD=ld
 
 #endif /* not ORDINARY_LINK */
 
-
-#ifdef MSDOS
-#ifdef HAVE_X_WINDOWS
-MSDOS_OBJ = dosfns.o msdos.o
-#else
-MSDOS_OBJ = dosfns.o msdos.o w16select.o termcap.o
-#endif
-#endif
-
 #ifdef HAVE_NS
 ns_appdir=@ns_appdir@/
 ns_appbindir=@ns_appbindir@/
@@ -370,7 +371,7 @@ obj=    dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
        process.o callproc.o \
        region-cache.o sound.o atimer.o \
        doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
-       $(MSDOS_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS)
+       $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS)
 
 /* Object files used on some machine or other.
    These go in the DOC file on all machines in case they are needed.  */
@@ -405,15 +406,6 @@ POST_ALLOC_OBJ=@POST_ALLOC_OBJ@
 otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(gmallocobj) $(rallocobj) \
   $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
 
-#ifdef MSDOS
-#define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
- ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \
- ${lispsource}term/internal.elc ${lispsource}term/pc-win.elc
-
-#else
-#define MSDOS_SUPPORT
-#endif
-
 /* This is the platform-specific list of Lisp files loaded into the
    dumped Emacs.  It is arranged like this because it is easier to generate
    it semi-mechanically from loadup.el this way.
@@ -511,7 +503,7 @@ lisp= \
        ${lispsource}ediff-hook.elc \
        ${lispsource}epa-hook.elc \
        ${TOOLTIP_SUPPORT} \
-       MSDOS_SUPPORT \
+       ${MSDOS_SUPPORT} \
        ${WINDOW_SUPPORT} \
        ${NS_SUPPORT} \
        ${lispsource}widget.elc \