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

* Makefile.in (XMENU_OBJ): Do not include xmenu.o if

Browse source 
HAVE_CARBON is defined.
This commit is contained in:
Steven Tamm 2004-03-14 18:43:56 +00:00
parent e61d86f7b9
commit 9062aa8928
2 changed files with 6 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 @@
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.

2
src/Makefile.in
View file

@ -449,7 +449,7 @@ LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM L
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 */