Mercurial > emacs
changeset 54393:e71cd75458d7
* Makefile.in (XMENU_OBJ): Do not include xmenu.o if
HAVE_CARBON is defined.
| author | Steven Tamm <steventamm@mac.com> |
|---|---|
| date | Sun, 14 Mar 2004 18:43:56 +0000 |
| parents | 4ab3a5beaea6 |
| children | 897eca9a17ed |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Mar 14 00:28:46 2004 +0000 +++ b/src/ChangeLog Sun Mar 14 18:43:56 2004 +0000 @@ -1,3 +1,8 @@ +2004-03-14 Steven Tamm <steventamm@mac.com> + + * Makefile.in (XMENU_OBJ): Do not include xmenu.o if + HAVE_CARBON is defined. + 2004-03-14 Kim F. Storm <storm@cua.dk> * dispextern.h (x_find_image_file): Add prototype.
--- a/src/Makefile.in Sun Mar 14 00:28:46 2004 +0000 +++ b/src/Makefile.in Sun Mar 14 18:43:56 2004 +0000 @@ -449,7 +449,7 @@ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM #endif /* not HAVE_X11 */ #else /* not HAVE_X_WINDOWS */ -#ifdef HAVE_MENUS +#if defined(HAVE_MENUS) && !defined(HAVE_CARBON) XMENU_OBJ = xmenu.o #endif #endif /* not HAVE_X_WINDOWS */