Mercurial > emacs
changeset 58075:7d999162c646
* Makefile.in (stamp-oldxmenu): If HAVE_GTK, don't add dependencies
to ${OLDXMENU}.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 09 Nov 2004 10:59:49 +0000 |
| parents | 62e7d254a653 |
| children | f23c519cb43f |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Nov 09 10:33:23 2004 +0000 +++ b/src/ChangeLog Tue Nov 09 10:59:49 2004 +0000 @@ -1,3 +1,8 @@ +2004-11-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * Makefile.in (stamp-oldxmenu): If HAVE_GTK, don't add dependencies + to ${OLDXMENU}. + 2004-11-09 Kim F. Storm <storm@cua.dk> * process.c (Fmake_network_process): Remove kludge for interrupted @@ -5,7 +10,7 @@ start over rather than sleeping and retry with same socket. 2004-11-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> - + * .cvsignore: Add buildobj.lst. * doc.c: New variable Vbuild_files.
--- a/src/Makefile.in Tue Nov 09 10:33:23 2004 +0000 +++ b/src/Makefile.in Tue Nov 09 10:59:49 2004 +0000 @@ -962,7 +962,7 @@ #define OLDXMENU_OPTIONS #endif -#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) +#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK) /* We use stamp-xmenu with these two deps to both ensure that lwlib gets remade based on its dependencies @@ -1018,12 +1018,12 @@ @true /* make -t should not create really-oldXMenu. */ .PHONY: really-oldXMenu #endif /* not USE_X_TOOLKIT */ -#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */ +#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */ /* We don\'t really need this, but satisfy the dependency. */ stamp-oldxmenu: touch stamp-oldxmenu -#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */ +#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */ ../config.status:: epaths.in @echo "The file epaths.h needs to be set up from epaths.in."