procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(XMENU_OBJ) [!HAVE_CARBON]: Reinstate variable.

Browse source 
(obj): Use XMENU_OBJ, not a literal xmenu.o.
This commit is contained in:
Eli Zaretskii 2005-09-17 09:10:35 +00:00
parent 8ccd36304d
commit cbf223e18a
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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.

7
src/Makefile.in
View file

@ -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 \