Mercurial > emacs
comparison src/Makefile.in @ 83078:fac24544c283
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-146
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-147
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-148
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-149
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-150
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-151
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-152
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-153
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-154
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-155
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-156
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-157
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-158
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-118
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 16 Mar 2004 20:27:22 +0000 |
parents | e3c68dad44a0 e71cd75458d7 |
children | eb7e8d483840 |
comparison
equal
deleted
inserted
replaced
83077:40fd42596e17 | 83078:fac24544c283 |
---|---|
303 #ifndef LIB_X11_LIB | 303 #ifndef LIB_X11_LIB |
304 #define LIB_X11_LIB -lX11 | 304 #define LIB_X11_LIB -lX11 |
305 #endif | 305 #endif |
306 | 306 |
307 #ifdef HAVE_X_WINDOWS | 307 #ifdef HAVE_X_WINDOWS |
308 | |
309 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o | |
310 | |
308 #ifdef HAVE_MENUS | 311 #ifdef HAVE_MENUS |
309 | 312 |
310 /* Include xmenu.o in the list of X object files. */ | 313 #ifndef HAVE_CARBON |
314 XMENU_OBJ = xmenu.o | |
315 #endif | |
311 | 316 |
312 #ifdef USE_GTK | 317 #ifdef USE_GTK |
313 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o fringe.o | 318 GTK_OBJ= gtkutil.o |
314 #else | |
315 XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o | |
316 #endif | 319 #endif |
317 | 320 |
318 /* The X Menu stuff is present in the X10 distribution, but missing | 321 /* The X Menu stuff is present in the X10 distribution, but missing |
319 from X11. If we have X10, just use the installed library; | 322 from X11. If we have X10, just use the installed library; |
320 otherwise, use our own copy. */ | 323 otherwise, use our own copy. */ |
330 LIBXMENU= -lXMenu | 333 LIBXMENU= -lXMenu |
331 #endif /* not HAVE_X11 */ | 334 #endif /* not HAVE_X11 */ |
332 | 335 |
333 #else /* not HAVE_MENUS */ | 336 #else /* not HAVE_MENUS */ |
334 | 337 |
335 /* Otherwise, omit xmenu.o from the list of X object files, and | 338 /* Otherwise, 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 fringe.o | |
338 LIBXMENU= | 339 LIBXMENU= |
339 #endif /* not HAVE_MENUS */ | 340 #endif /* not HAVE_MENUS */ |
340 | 341 |
341 #ifdef USE_X_TOOLKIT | 342 #ifdef USE_X_TOOLKIT |
342 #define @X_TOOLKIT_TYPE@ | 343 #define @X_TOOLKIT_TYPE@ |
445 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT | 446 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT |
446 LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM | 447 LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM |
447 #else /* not HAVE_X11 */ | 448 #else /* not HAVE_X11 */ |
448 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM | 449 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM |
449 #endif /* not HAVE_X11 */ | 450 #endif /* not HAVE_X11 */ |
451 #else /* not HAVE_X_WINDOWS */ | |
452 #if defined(HAVE_MENUS) && !defined(HAVE_CARBON) | |
453 XMENU_OBJ = xmenu.o | |
454 #endif | |
450 #endif /* not HAVE_X_WINDOWS */ | 455 #endif /* not HAVE_X_WINDOWS */ |
451 | 456 |
452 LIBSOUND= @LIBSOUND@ | 457 LIBSOUND= @LIBSOUND@ |
453 | 458 |
454 #ifndef ORDINARY_LINK | 459 #ifndef ORDINARY_LINK |
559 #endif | 564 #endif |
560 #endif | 565 #endif |
561 | 566 |
562 #ifdef HAVE_CARBON | 567 #ifdef HAVE_CARBON |
563 mac = $(dot)$(dot)/mac/ | 568 mac = $(dot)$(dot)/mac/ |
564 XMENU_OBJ = | 569 MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o image.o |
565 MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o | |
566 emacsapp = $(PWD)/$(mac)Emacs.app/ | 570 emacsapp = $(PWD)/$(mac)Emacs.app/ |
567 emacsappsrc = ${srcdir}/../mac/Emacs.app/ | 571 emacsappsrc = ${srcdir}/../mac/Emacs.app/ |
568 #else | |
569 XMENU_OBJ = xmenu.o | |
570 #endif | 572 #endif |
571 | 573 |
572 /* lastfile must follow all files | 574 /* lastfile must follow all files |
573 whose initialized data areas should be dumped as pure by dump-emacs. */ | 575 whose initialized data areas should be dumped as pure by dump-emacs. */ |
574 obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ | 576 obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ |
575 charset.o coding.o category.o ccl.o \ | 577 charset.o coding.o category.o ccl.o \ |
576 cm.o term.o xfaces.o $(XOBJ) \ | 578 cm.o term.o xfaces.o $(XOBJ) $(GTK_OBJ)\ |
577 emacs.o keyboard.o macros.o keymap.o sysdep.o \ | 579 emacs.o keyboard.o macros.o keymap.o sysdep.o \ |
578 buffer.o filelock.o insdel.o marker.o \ | 580 buffer.o filelock.o insdel.o marker.o \ |
579 minibuf.o fileio.o dired.o filemode.o \ | 581 minibuf.o fileio.o dired.o filemode.o \ |
580 cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \ | 582 cmds.o casetab.o casefiddle.o indent.o search.o regex.o undo.o \ |
581 alloc.o data.o doc.o editfns.o callint.o \ | 583 alloc.o data.o doc.o editfns.o callint.o \ |
1079 msdos.h dosfns.h dispextern.h $(config_h) | 1081 msdos.h dosfns.h dispextern.h $(config_h) |
1080 fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h) | 1082 fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h) |
1081 fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \ | 1083 fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \ |
1082 keyboard.h termhooks.h $(config_h) | 1084 keyboard.h termhooks.h $(config_h) |
1083 getloadavg.o: getloadavg.c $(config_h) | 1085 getloadavg.o: getloadavg.c $(config_h) |
1086 image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \ | |
1087 systime.h xterm.h w32term.h w32gui.h macterm.h macgui.h $(config_h) | |
1084 indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \ | 1088 indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \ |
1085 termopts.h disptab.h region-cache.h charset.h composite.h dispextern.h \ | 1089 termopts.h disptab.h region-cache.h charset.h composite.h dispextern.h \ |
1086 keyboard.h | 1090 keyboard.h |
1087 insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.h \ | 1091 insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.h \ |
1088 dispextern.h atimer.h systime.h $(config_h) | 1092 dispextern.h atimer.h systime.h $(config_h) |