Mercurial > emacs
comparison src/Makefile.in @ 83038:30ccd595ccb0
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-98
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-99
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-100
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-101
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-102
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-78
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 18 Feb 2004 17:10:32 +0000 |
parents | 03a73693678e 56a9e0fafeda |
children | e3c68dad44a0 |
comparison
equal
deleted
inserted
replaced
83037:03a73693678e | 83038:30ccd595ccb0 |
---|---|
308 #ifdef HAVE_MENUS | 308 #ifdef HAVE_MENUS |
309 | 309 |
310 /* Include xmenu.o in the list of X object files. */ | 310 /* Include xmenu.o in the list of X object files. */ |
311 | 311 |
312 #ifdef USE_GTK | 312 #ifdef USE_GTK |
313 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o | 313 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o fringe.o |
314 #else | 314 #else |
315 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o | 315 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o |
316 #endif | 316 #endif |
317 | 317 |
318 /* The X Menu stuff is present in the X10 distribution, but missing | 318 /* The X Menu stuff is present in the X10 distribution, but missing |
319 from X11. If we have X10, just use the installed library; | 319 from X11. If we have X10, just use the installed library; |
320 otherwise, use our own copy. */ | 320 otherwise, use our own copy. */ |
332 | 332 |
333 #else /* not HAVE_MENUS */ | 333 #else /* not HAVE_MENUS */ |
334 | 334 |
335 /* Otherwise, omit xmenu.o from the list of X object files, and | 335 /* Otherwise, omit xmenu.o from the list of X object files, and |
336 don't worry about the menu library at all. */ | 336 don't worry about the menu library at all. */ |
337 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o | 337 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o |
338 LIBXMENU= | 338 LIBXMENU= |
339 #endif /* not HAVE_MENUS */ | 339 #endif /* not HAVE_MENUS */ |
340 | 340 |
341 #ifdef USE_X_TOOLKIT | 341 #ifdef USE_X_TOOLKIT |
342 #define @X_TOOLKIT_TYPE@ | 342 #define @X_TOOLKIT_TYPE@ |
560 #endif | 560 #endif |
561 | 561 |
562 #ifdef HAVE_CARBON | 562 #ifdef HAVE_CARBON |
563 mac = $(dot)$(dot)/mac/ | 563 mac = $(dot)$(dot)/mac/ |
564 XMENU_OBJ = | 564 XMENU_OBJ = |
565 MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o | 565 MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o |
566 emacsapp = $(PWD)/$(mac)Emacs.app/ | 566 emacsapp = $(PWD)/$(mac)Emacs.app/ |
567 emacsappsrc = ${srcdir}/../mac/Emacs.app/ | 567 emacsappsrc = ${srcdir}/../mac/Emacs.app/ |
568 #else | 568 #else |
569 XMENU_OBJ = xmenu.o | 569 XMENU_OBJ = xmenu.o |
570 #endif | 570 #endif |
571 | 571 |
572 /* lastfile must follow all files | 572 /* lastfile must follow all files |
573 whose initialized data areas should be dumped as pure by dump-emacs. */ | 573 whose initialized data areas should be dumped as pure by dump-emacs. */ |
574 obj= dispnew.o frame.o scroll.o xdisp.o fringe.o $(XMENU_OBJ) window.o \ | 574 obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ |
575 charset.o coding.o category.o ccl.o \ | 575 charset.o coding.o category.o ccl.o \ |
576 cm.o term.o xfaces.o $(XOBJ) \ | 576 cm.o term.o xfaces.o $(XOBJ) \ |
577 emacs.o keyboard.o macros.o keymap.o sysdep.o \ | 577 emacs.o keyboard.o macros.o keymap.o sysdep.o \ |
578 buffer.o filelock.o insdel.o marker.o \ | 578 buffer.o filelock.o insdel.o marker.o \ |
579 minibuf.o fileio.o dired.o filemode.o \ | 579 minibuf.o fileio.o dired.o filemode.o \ |