diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2004-11-09 10:59:49 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2004-11-09 10:59:49 +0000 |
| commit | 16bf4e3264ebe086f5a86b16f3adb3e9fdf7dbce (patch) | |
| tree | 2bfac8e5a56b1ee3a1ecb45f15dc3095c7a5b1bd | |
| parent | a7a7ddf104818c610cfb7cf4674dcd9ab8c39a58 (diff) | |
| download | emacs-16bf4e3264ebe086f5a86b16f3adb3e9fdf7dbce.tar.gz | |
* Makefile.in (stamp-oldxmenu): If HAVE_GTK, don't add dependencies
to ${OLDXMENU}.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bc7954f12d1..74903bd1a3e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/Makefile.in b/src/Makefile.in index 48952f674bb..3fd63fe5251 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -962,7 +962,7 @@ prefix-args${EXEEXT}: prefix-args.c $(config_h) #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 @@ really-oldXMenu: @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." |