diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6704efa084b..cbacb14078a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-09-17 Eli Zaretskii <eliz@gnu.org> + + * Makefile.in (XMENU_OBJ) [!HAVE_CARBON]: Reinstate variable. + (obj): Use XMENU_OBJ, not a literal xmenu.o. + 2005-09-16 Romain Francoise <romain@orebokech.com> * fileio.c (syms_of_fileio) <write-region-inhibit-fsync>: Doc fix. diff --git a/src/Makefile.in b/src/Makefile.in index c085473d437..5cc933c9734 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -304,6 +304,11 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcd #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 @@ emacsappsrc = ${srcdir}/../mac/Emacs.app/ /* 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 \ |