[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100270: Replace some msdos cpp.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100270: Replace some msdos cpp. |
Date: |
Thu, 13 May 2010 20:13:39 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100270
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-13 20:13:39 -0700
message:
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.
modified:
msdos/ChangeLog
msdos/sed1v2.inp
msdos/sed1x.inp
src/ChangeLog
src/Makefile.in
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2010-05-14 03:05:00 +0000
+++ b/msdos/ChangeLog 2010-05-14 03:13:39 +0000
@@ -1,5 +1,9 @@
2010-05-14 Glenn Morris <address@hidden>
+ * 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).
=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp 2010-05-14 03:05:00 +0000
+++ b/msdos/sed1v2.inp 2010-05-14 03:13:39 +0000
@@ -89,6 +89,8 @@
/^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@//
=== modified file 'msdos/sed1x.inp'
--- a/msdos/sed1x.inp 2010-05-14 03:05:00 +0000
+++ b/msdos/sed1x.inp 2010-05-14 03:13:39 +0000
@@ -8,6 +8,7 @@
/^LIBXMENU *=/address@hidden@!${OLDXMENU}!
/^LIBX_OTHER *=/address@hidden@!${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!
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-05-14 03:05:00 +0000
+++ b/src/ChangeLog 2010-05-14 03:13:39 +0000
@@ -1,5 +1,12 @@
2010-05-14 Glenn Morris <address@hidden>
+ * 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,
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2010-05-14 03:05:00 +0000
+++ b/src/Makefile.in 2010-05-14 03:13:39 +0000
@@ -184,6 +184,16 @@
## sheap.o if CYGWIN, otherwise empty.
address@hidden@
+## 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 =
+
address@hidden@
address@hidden@
## Next two only set if NS_IMPL_GNUSTEP.
@@ -340,15 +350,6 @@
#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
address@hidden@/
address@hidden@/
@@ -370,7 +371,7 @@
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 @@
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 @@
${lispsource}ediff-hook.elc \
${lispsource}epa-hook.elc \
${TOOLTIP_SUPPORT} \
- MSDOS_SUPPORT \
+ ${MSDOS_SUPPORT} \
${WINDOW_SUPPORT} \
${NS_SUPPORT} \
${lispsource}widget.elc \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100270: Replace some msdos cpp.,
Glenn Morris <=