diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-12-25 01:24:56 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-12-25 01:24:56 +0000 |
| commit | f48e63f030fd189075914edd965643b71a3bb25b (patch) | |
| tree | 4cbe882fbfc976a32067be9a7e08289cd35a0f2f /src/Makefile.in | |
| parent | 94106e3200302b4f87db3ea06bf7da79d8ccd083 (diff) | |
| download | emacs-f48e63f030fd189075914edd965643b71a3bb25b.tar.gz | |
(XOBJ, LIBXMENU, $(OLDXMENU), really-oldXMenu):
HAVE_X_MENU renamed to HAVE_MENUS.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 241271a74fe..86a111e041e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -285,7 +285,7 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAG) -I. -I${srcdi #endif #ifdef HAVE_X_WINDOWS -#ifdef HAVE_X_MENU +#ifdef HAVE_MENUS /* Include xmenu.o in the list of X object files. */ XOBJ= xterm.o xfns.o xfaces.o xmenu.o xselect.o xrdb.o @@ -305,13 +305,13 @@ LIBXMENU= $(OLDXMENU) LIBXMENU= -lXMenu #endif /* not HAVE_X11 */ -#else /* not HAVE_X_MENU */ +#else /* not HAVE_MENUS */ /* Otherwise, omit xmenu.o from the list of X object files, and don't worry about the menu library at all. */ XOBJ= xterm.o xfns.o xfaces.o xselect.o xrdb.o LIBXMENU= -#endif /* not HAVE_X_MENU */ +#endif /* not HAVE_MENUS */ #ifdef USE_X_TOOLKIT #define @X_TOOLKIT_TYPE@ @@ -829,7 +829,7 @@ really-lwlib: @true /* make -t should not create really-lwlib. */ .PHONY: really-lwlib #else /* not USE_X_TOOLKIT */ -#ifdef HAVE_X_MENU +#ifdef HAVE_MENUS $(OLDXMENU): really-oldXMenu /* Encode the values of these two macros in Make variables, @@ -851,7 +851,7 @@ really-oldXMenu: "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)" @true /* make -t should not create really-oldXMenu. */ .PHONY: really-oldXMenu -#endif /* HAVE_X_MENU */ +#endif /* HAVE_MENUS */ #endif /* not USE_X_TOOLKIT */ #endif /* HAVE_X11 */ #endif /* HAVE_X_WINDOWS */ |