diff options
| author | Roland McGrath | 1996-01-12 19:52:53 +0000 |
|---|---|---|
| committer | Roland McGrath | 1996-01-12 19:52:53 +0000 |
| commit | 6c6c2f6973f43587d1462e55477e8b90eb85a5ae (patch) | |
| tree | a90b228c957f69265feb902653180c177d8b02bc /src | |
| parent | c87d0294a0319c1ae3beb5e226bfbf8bbecb1593 (diff) | |
| download | emacs-6c6c2f6973f43587d1462e55477e8b90eb85a5ae.tar.gz emacs-6c6c2f6973f43587d1462e55477e8b90eb85a5ae.zip | |
($(OLDXMENU) rules): Fix conditionals so no rules are defined when !HAVE_MENUS.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 94817d280f4..9f2381c79f1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -803,8 +803,8 @@ shortnames: | |||
| 803 | #define LWLIB_OPTIONS | 803 | #define LWLIB_OPTIONS |
| 804 | #endif | 804 | #endif |
| 805 | 805 | ||
| 806 | #ifdef HAVE_X_WINDOWS | 806 | #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) |
| 807 | #ifdef HAVE_X11 | 807 | |
| 808 | #ifdef USE_X_TOOLKIT | 808 | #ifdef USE_X_TOOLKIT |
| 809 | $(OLDXMENU): really-lwlib | 809 | $(OLDXMENU): really-lwlib |
| 810 | 810 | ||
| @@ -828,7 +828,6 @@ really-lwlib: | |||
| 828 | @true /* make -t should not create really-lwlib. */ | 828 | @true /* make -t should not create really-lwlib. */ |
| 829 | .PHONY: really-lwlib | 829 | .PHONY: really-lwlib |
| 830 | #else /* not USE_X_TOOLKIT */ | 830 | #else /* not USE_X_TOOLKIT */ |
| 831 | #ifdef HAVE_MENUS | ||
| 832 | $(OLDXMENU): really-oldXMenu | 831 | $(OLDXMENU): really-oldXMenu |
| 833 | 832 | ||
| 834 | /* Encode the values of these two macros in Make variables, | 833 | /* Encode the values of these two macros in Make variables, |
| @@ -850,10 +849,8 @@ really-oldXMenu: | |||
| 850 | "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)" | 849 | "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)" |
| 851 | @true /* make -t should not create really-oldXMenu. */ | 850 | @true /* make -t should not create really-oldXMenu. */ |
| 852 | .PHONY: really-oldXMenu | 851 | .PHONY: really-oldXMenu |
| 853 | #endif /* HAVE_MENUS */ | ||
| 854 | #endif /* not USE_X_TOOLKIT */ | 852 | #endif /* not USE_X_TOOLKIT */ |
| 855 | #endif /* HAVE_X11 */ | 853 | #endif /* HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS */ |
| 856 | #endif /* HAVE_X_WINDOWS */ | ||
| 857 | 854 | ||
| 858 | paths.h: paths.in | 855 | paths.h: paths.in |
| 859 | @echo "The file paths.h needs to be set up from paths.in." | 856 | @echo "The file paths.h needs to be set up from paths.in." |