[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/Makefile.in
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/src/Makefile.in |
Date: |
Sat, 17 Sep 2005 05:07:33 -0400 |
Index: emacs/src/Makefile.in
diff -c emacs/src/Makefile.in:1.314 emacs/src/Makefile.in:1.315
*** emacs/src/Makefile.in:1.314 Thu Sep 15 13:13:54 2005
--- emacs/src/Makefile.in Sat Sep 17 09:07:32 2005
***************
*** 304,309 ****
--- 304,314 ----
#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,576 ****
/* 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 \
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 \
--- 575,581 ----
/* 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_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 \