diff options
| author | Jan Djärv | 2004-11-09 10:59:49 +0000 |
|---|---|---|
| committer | Jan Djärv | 2004-11-09 10:59:49 +0000 |
| commit | 16bf4e3264ebe086f5a86b16f3adb3e9fdf7dbce (patch) | |
| tree | 2bfac8e5a56b1ee3a1ecb45f15dc3095c7a5b1bd /src/Makefile.in | |
| parent | a7a7ddf104818c610cfb7cf4674dcd9ab8c39a58 (diff) | |
| download | emacs-16bf4e3264ebe086f5a86b16f3adb3e9fdf7dbce.tar.gz emacs-16bf4e3264ebe086f5a86b16f3adb3e9fdf7dbce.zip | |
* Makefile.in (stamp-oldxmenu): If HAVE_GTK, don't add dependencies
to ${OLDXMENU}.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
| 962 | #define OLDXMENU_OPTIONS | 962 | #define OLDXMENU_OPTIONS |
| 963 | #endif | 963 | #endif |
| 964 | 964 | ||
| 965 | #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) | 965 | #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK) |
| 966 | 966 | ||
| 967 | /* We use stamp-xmenu with these two deps | 967 | /* We use stamp-xmenu with these two deps |
| 968 | to both ensure that lwlib gets remade based on its dependencies | 968 | to both ensure that lwlib gets remade based on its dependencies |
| @@ -1018,12 +1018,12 @@ really-oldXMenu: | |||
| 1018 | @true /* make -t should not create really-oldXMenu. */ | 1018 | @true /* make -t should not create really-oldXMenu. */ |
| 1019 | .PHONY: really-oldXMenu | 1019 | .PHONY: really-oldXMenu |
| 1020 | #endif /* not USE_X_TOOLKIT */ | 1020 | #endif /* not USE_X_TOOLKIT */ |
| 1021 | #else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */ | 1021 | #else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */ |
| 1022 | 1022 | ||
| 1023 | /* We don\'t really need this, but satisfy the dependency. */ | 1023 | /* We don\'t really need this, but satisfy the dependency. */ |
| 1024 | stamp-oldxmenu: | 1024 | stamp-oldxmenu: |
| 1025 | touch stamp-oldxmenu | 1025 | touch stamp-oldxmenu |
| 1026 | #endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */ | 1026 | #endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */ |
| 1027 | 1027 | ||
| 1028 | ../config.status:: epaths.in | 1028 | ../config.status:: epaths.in |
| 1029 | @echo "The file epaths.h needs to be set up from epaths.in." | 1029 | @echo "The file epaths.h needs to be set up from epaths.in." |