Mercurial > emacs
changeset 65562:e8ab227fe84d
(XMENU_OBJ) [!HAVE_CARBON]: Reinstate variable.
(obj): Use XMENU_OBJ, not a literal xmenu.o.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 17 Sep 2005 09:07:32 +0000 |
| parents | feeffd8b143e |
| children | 7e7ac593a360 |
| files | src/Makefile.in |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile.in Sat Sep 17 05:02:16 2005 +0000 +++ b/src/Makefile.in Sat Sep 17 09:07:32 2005 +0000 @@ -304,6 +304,11 @@ #define LIB_X11_LIB -lX11 #endif +/* xmenu.c should not be compiled on OSX. */ +#ifndef HAVE_CARBON +XMENU_OBJ = xmenu.o +#endif + #ifdef HAVE_X_WINDOWS XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o @@ -570,7 +575,7 @@ /* lastfile must follow all files whose initialized data areas should be dumped as pure by dump-emacs. */ -obj= dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o \ +obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ charset.o coding.o category.o ccl.o \ cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\ emacs.o keyboard.o macros.o keymap.o sysdep.o \