diff options
| author | Eli Zaretskii | 2004-02-16 16:16:16 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2004-02-16 16:16:16 +0000 |
| commit | 3cf0b44b4a6224a17e2cd4332323b5595c249944 (patch) | |
| tree | 086753d672a2ca73d414aba731a7ee207a6bcdd9 /src | |
| parent | 065b7364dab53f00b28b91533c90f319720722be (diff) | |
| download | emacs-3cf0b44b4a6224a17e2cd4332323b5595c249944.tar.gz emacs-3cf0b44b4a6224a17e2cd4332323b5595c249944.zip | |
(obj): Move fringe.o from here...
(XOBJ, MAC_OBJ): ...to here.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index bc71b772cca..ecf59f87b59 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -310,9 +310,9 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcd | |||
| 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 |
| @@ -334,7 +334,7 @@ LIBXMENU= -lXMenu | |||
| 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 | ||
| @@ -562,7 +562,7 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o | |||
| 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 |
| @@ -571,7 +571,7 @@ XMENU_OBJ = xmenu.o | |||
| 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 \ |