diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | msdos/ChangeLog | 3 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 1 | ||||
| -rw-r--r-- | msdos/sed1x.inp | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 36 |
7 files changed, 34 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index 1b52a3784f8..fee67f5b26f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2010-05-15 Glenn Morris <rgm@gnu.org> + * configure.in (OLDXMENU_TARGET): New output variable. + * Makefile.in (install-arch-dep): Update odd NS rule for Emacs version. * Makefile.in (install-arch-indep): Remove references to RCS, CVS, diff --git a/configure.in b/configure.in index 2475caae053..c512350fba7 100644 --- a/configure.in +++ b/configure.in @@ -3126,10 +3126,13 @@ AC_SUBST(TOOLKIT_LIBW) if test "$USE_X_TOOLKIT" = "none"; then LIBXT_OTHER="\$(LIBXSM)" + OLDXMENU_TARGET="really-oldXMenu" else LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" + OLDXMENU_TARGET="really-lwlib" fi AC_SUBST(LIBXT_OTHER) +AC_SUBST(OLDXMENU_TARGET) ## The X Menu stuff is present in the X10 distribution, but missing ## from X11. If we have X10, just use the installed library; diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 22617544814..46254219844 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,5 +1,8 @@ 2010-05-15 Glenn Morris <rgm@gnu.org> + * sed1v2.inp (OLDXMENU_TARGET): Edit to empty. + * sed1x.inp (OLDXMENU_TARGET): Edit to really-oldxmenu. + * sed1v2.inp (LIBXT_OTHER): Exit to empty. 2010-05-14 Glenn Morris <rgm@gnu.org> diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index e43e79d7579..f4774a1017b 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -82,6 +82,7 @@ s/\.h\.in/.h-in/ /^LIBXSM *=/s/@LIBXSM@// /^LIBXTR6 *=/s/@LIBXTR6@// /^LIBXT_OTHER *=/s/@LIBXT_OTHER@// +/^OLDXMENU_TARGET *=/s/@OLDXMENU_TARGET@// /^XOBJ *=/s/@XOBJ@// /^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// /^LIBSOUND *=/s/@LIBSOUND@// diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp index bcdb0fec0ed..d9d7a87c992 100644 --- a/msdos/sed1x.inp +++ b/msdos/sed1x.inp @@ -7,6 +7,7 @@ s/DOC/DOC-X/g /^OLDXMENU *=/s!@OLDXMENU@!${oldXMenudir}libXMenu11.a! /^LIBXMENU *=/s!@LIBXMENU@!${OLDXMENU}! /^LIBX_OTHER *=/s!@LIBX_OTHER@!${LIBXT} ${LIBX_EXTRA}! +/^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu! /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys! /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o! /^TOOLTIP_SUPPORT *=/s!= *!= ${lispsource}tooltip.elc! diff --git a/src/ChangeLog b/src/ChangeLog index 1b1ea399210..e9c01ee552d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2010-05-15 Glenn Morris <rgm@gnu.org> + * Makefile.in (OLDXMENU_TARGET): New, set by configure. + (really-lwlib, really-oldXMenu): Always define. + ($OLDXMENU): Depend on $OLDXMENU_TARGET. + * Makefile.in: Simplify cpp conditional. * Makefile.in (${ns_appdir}): Simplify using umask. diff --git a/src/Makefile.in b/src/Makefile.in index 2dd7340f9f8..ff3d632bfa5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -65,6 +65,7 @@ config_h = config.h $(M_FILE) $(S_FILE) bootstrap_exe = ${abs_builddir}/bootstrap-emacs${EXEEXT} +## ns-app if HAVE_NS, else empty. OTHER_FILES = @OTHER_FILES@ CRT_DIR=@CRT_DIR@ @@ -167,6 +168,10 @@ LIBXTR6=@LIBXTR6@ ## Only used if HAVE_X_WINDOWS. LIBXT_OTHER=@LIBXT_OTHER@ +## Only used if HAVE_X11 && !USE_GTK. +## really-lwlib if USE_X_TOOLKIT, else really-oldxmenu. +OLDXMENU_TARGET=@OLDXMENU_TARGET@ + XMENU_OBJ=@XMENU_OBJ@ XOBJ=@XOBJ@ @@ -665,35 +670,34 @@ temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} pr prefix-args${EXEEXT}: prefix-args.o $(config_h) $(CC) $(LDFLAGS) prefix-args.o -o prefix-args -/* HAVE_X11 implies HAVE_X_WINDOWS and HAVE_MENUS. */ -#if defined (HAVE_X11) && ! defined (USE_GTK) -/* We use stamp-xmenu with these two deps to both ensure that lwlib - gets remade based on its dependencies in its own makefile, - and remake temacs if lwlib gets changed by this. */ -stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) - touch stamp-oldxmenu -/* Supply an ordering for parallel make. */ -../src/$(OLDXMENU): ${OLDXMENU} - -#ifdef USE_X_TOOLKIT -$(OLDXMENU): really-lwlib +/* Only (possibly) used if HAVE_X11 && !USE_GTK, but no harm in always + defining. */ really-lwlib: cd ${lwlibdir}; ${MAKE} ${MFLAGS} \ CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' @true /* make -t should not create really-lwlib. */ .PHONY: really-lwlib -#else /* not USE_X_TOOLKIT */ -$(OLDXMENU): really-oldXMenu really-oldXMenu: cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \ CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' @true /* make -t should not create really-oldXMenu. */ .PHONY: really-oldXMenu -#endif /* not USE_X_TOOLKIT */ -#else /* !HAVE_X11 || USE_GTK */ +/* HAVE_X11 implies HAVE_X_WINDOWS and HAVE_MENUS. */ +#if defined (HAVE_X11) && ! defined (USE_GTK) +/* We use stamp-xmenu with these two deps to both ensure that lwlib + gets remade based on its dependencies in its own makefile, + and remake temacs if lwlib gets changed by this. */ +stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) + touch stamp-oldxmenu +/* Supply an ordering for parallel make. */ +../src/$(OLDXMENU): ${OLDXMENU} + +$(OLDXMENU): $(OLDXMENU_TARGET) + +#else /* !HAVE_X11 || USE_GTK */ /* We don''t really need this, but satisfy the dependency. */ stamp-oldxmenu: touch stamp-oldxmenu |