Mercurial > emacs
changeset 88025:4794ef0780fc
* configure.in: Update comment.
* Makefile.in: Remove references to unused macros.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sun, 27 Jan 2008 16:06:02 +0000 |
parents | 18495b035226 |
children | 8fd9758cf44d |
files | ChangeLog configure.in src/ChangeLog src/Makefile.in |
diffstat | 4 files changed, 11 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 27 15:59:30 2008 +0000 +++ b/ChangeLog Sun Jan 27 16:06:02 2008 +0000 @@ -1,3 +1,7 @@ +2008-01-27 Dan Nicolaescu <dann@ics.uci.edu> + + * configure.in: Update comment. + 2008-01-26 Glenn Morris <rgm@gnu.org> * configure.in (--without-gcc): By default, neither off nor on.
--- a/configure.in Sun Jan 27 15:59:30 2008 +0000 +++ b/configure.in Sun Jan 27 16:06:02 2008 +0000 @@ -2676,8 +2676,7 @@ #endif /* Multi-tty support relies on MULTI_KBOARD. It seems safe to turn it - on unconditionally. Note that src/s/darwin.h disables this at - present. */ + on unconditionally. */ #ifndef MULTI_KBOARD #define MULTI_KBOARD #endif
--- a/src/ChangeLog Sun Jan 27 15:59:30 2008 +0000 +++ b/src/ChangeLog Sun Jan 27 16:06:02 2008 +0000 @@ -1,3 +1,7 @@ +2008-01-27 Dan Nicolaescu <dann@ics.uci.edu> + + * Makefile.in: Remove references to unused macros. + 2008-01-26 Eli Zaretskii <eliz@gnu.org> * w32.c (g_b_init_get_sid_sub_authority)
--- a/src/Makefile.in Sun Jan 27 15:59:30 2008 +0000 +++ b/src/Makefile.in Sun Jan 27 16:06:02 2008 +0000 @@ -993,12 +993,7 @@ ${libsrc}make-docfile${EXEEXT}: cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT} -/* Some systems define this to cause parallel Make-ing. */ -#ifndef MAKE_PARALLEL -#define MAKE_PARALLEL -#endif - -temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT} +temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT} echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ -o temacs ${STARTFILES} ${obj} ${otherobj} \ @@ -1010,11 +1005,6 @@ prefix-args${EXEEXT}: prefix-args.c $(config_h) $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args -/* Do not lose if this was not defined. */ -#ifndef OLDXMENU_OPTIONS -#define OLDXMENU_OPTIONS -#endif - #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK) /* We use stamp-xmenu with these two deps @@ -1060,7 +1050,7 @@ C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM really-oldXMenu: - cd ${oldXMenudir}; ${MAKE} ${MFLAGS} OLDXMENU_OPTIONS \ + cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \ CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \ "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \ "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \