diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-05-18 23:04:16 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-05-18 23:04:16 -0700 |
| commit | 4a720484822c3a766dd1775dd659e1a969605457 (patch) | |
| tree | 0cc0783a2fe3c672e6d02ddbab14cca64847c328 /msdos | |
| parent | 23373930daa192623bfda56960ccb04b2703fbe5 (diff) | |
| download | emacs-4a720484822c3a766dd1775dd659e1a969605457.tar.gz | |
Remove the SOME_MACHINE_LISP distinction in src/Makefile.in.
See discussion in http://debbugs.gnu.org/8302
* configure.in (NS_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
(WINDOW_SUPPORT): Remove output variables that are no longer used.
* lib-src/makefile.w32-in (echolisp): Remove rule that is no longer needed.
(clean): No more echolisp.tmp.
* .bzrignore: Remove lib-src/echolisp.tmp.
* lisp/emacs-lisp/autoload.el (batch-update-autoloads):
Set autoload-excludes by parsing lisp/loadup.el rather than Makefiles.
* lisp/loadup.el: Update commentary.
* msdos/sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT):
* msdos/sed1v2.inp (MSDOS_SUPPORT, NS_SUPPORT, MOUSE_SUPPORT)
(TOOLTIP_SUPPORT, WINDOW_SUPPORT): No need to edit these any more.
* src/Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT)
(REAL_MOUSE_SUPPORT, GPM_MOUSE_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
(BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT, WINDOW_SUPPORT): Remove.
(lisp): Set the order to that of loadup.el.
(shortlisp): Make it a copy of $lisp.
(SOME_MACHINE_LISP): Remove.
($(etc)/DOC): Depend just on $lisp, not $SOME_MACHINE_LISP too.
Use just $shortlisp, not $SOME_MACHINE_LISP too.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 6 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 5 | ||||
| -rw-r--r-- | msdos/sed1x.inp | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 12fd7675d67..6c07c76d1bf 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,9 @@ +2011-05-19 Glenn Morris <rgm@gnu.org> + + * sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT): + * sed1v2.inp (MSDOS_SUPPORT, NS_SUPPORT, MOUSE_SUPPORT) + (TOOLTIP_SUPPORT, WINDOW_SUPPORT): No need to edit these any more. + 2011-05-07 Eli Zaretskii <eliz@gnu.org> * inttypes.h: Include stdint.h. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 44ee53a5c34..34c4588f96a 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -94,13 +94,11 @@ s/\.h\.in/.h-in/ /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// /^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/ -/^MSDOS_SUPPORT *=/s/= */= $(MSDOS_SUPPORT_REAL)/ /^ns_appdir *=/s/@ns_appdir@// /^ns_appbindir *=/s/@ns_appbindir@// /^ns_appsrc *=/s/@ns_appsrc@// /^NS_OBJ *=/s/@NS_OBJ@// /^NS_OBJC_OBJ *=/s/@NS_OBJC_OBJ@// -/^NS_SUPPORT *=/s/@NS_SUPPORT@// /^GNU_OBJC_CFLAGS*=/s/@GNU_OBJC_CFLAGS@// /^LIBRESOLV *=/s/@LIBRESOLV@// /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// @@ -111,9 +109,6 @@ s/\.h\.in/.h-in/ /^OTHER_FILES *=/s/@OTHER_FILES@// /^XMENU_OBJ *=/s/@XMENU_OBJ@/xmenu.o/ /^FONT_OBJ *=/s/@FONT_OBJ@// -/^MOUSE_SUPPORT *=/s/@MOUSE_SUPPORT@/$(REAL_MOUSE_SUPPORT)/ -/^TOOLTIP_SUPPORT *=/s/@TOOLTIP_SUPPORT@// -/^WINDOW_SUPPORT *=/s/@WINDOW_SUPPORT@// /^LIBGPM *=/s/@LIBGPM@// /^EXEEXT *=/s/@EXEEXT@/.exe/ /^OLDXMENU *=/s/@OLDXMENU@/nothing/ diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index dff76fda27b..d0a37807d9e 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -26,7 +26,5 @@ s/DOC/DOC-X/g /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o! /^FONT_OBJ *=/s!= *!= xfont.o! -/^TOOLTIP_SUPPORT *=/s!= *!= ${lispsource}tooltip.elc! -/^WINDOW_SUPPORT *=/s!= *!= $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)! /^temacs *:/s!OLDXMENU!LIBXMENU! |