* Move fringe.o to window-system specific lists of *.o files
@ 2004-02-16 11:27 Eli Zaretskii
2004-02-16 13:14 ` Kim F. Storm
0 siblings, 1 reply; 3+ messages in thread
From: Eli Zaretskii @ 2004-02-16 11:27 UTC (permalink / raw)
Kim, any objections to the following change in src/Makefile.in? I
don't think it makes sense to have fringe.o in the list of object
files compiled on all platforms, even those that don't support
graphics displays, since the entire fringe.c is conditioned on
HAVE_WINDOW_SYSTEM.
Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.290
diff -u -r1.290 Makefile.in
--- src/Makefile.in 8 Feb 2004 23:17:23 -0000 1.290
+++ src/Makefile.in 16 Feb 2004 11:24:00 -0000
@@ -310,9 +310,9 @@
/* Include xmenu.o in the list of X object files. */
#ifdef USE_GTK
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o fringe.o
#else
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o
#endif
/* The X Menu stuff is present in the X10 distribution, but missing
@@ -334,7 +334,7 @@
/* Otherwise, omit xmenu.o from the list of X object files, and
don't worry about the menu library at all. */
-XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o
+XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o
LIBXMENU=
#endif /* not HAVE_MENUS */
@@ -562,7 +562,7 @@
#ifdef HAVE_CARBON
mac = $(dot)$(dot)/mac/
XMENU_OBJ =
-MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o
+MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o
emacsapp = $(PWD)/$(mac)Emacs.app/
emacsappsrc = ${srcdir}/../mac/Emacs.app/
#else
@@ -571,7 +571,7 @@
/* 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 fringe.o $(XMENU_OBJ) window.o \
+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) \
emacs.o keyboard.o macros.o keymap.o sysdep.o \
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Move fringe.o to window-system specific lists of *.o files
2004-02-16 11:27 Move fringe.o to window-system specific lists of *.o files Eli Zaretskii
@ 2004-02-16 13:14 ` Kim F. Storm
2004-02-16 16:19 ` Eli Zaretskii
0 siblings, 1 reply; 3+ messages in thread
From: Kim F. Storm @ 2004-02-16 13:14 UTC (permalink / raw)
Cc: emacs-devel
"Eli Zaretskii" <eliz@elta.co.il> writes:
> Kim, any objections to the following change in src/Makefile.in?
No, that is ok with me (and thank you for the fix). Pls. install it.
The reason I put it in its current position is that it is basically
just code that was extracted from xdisp.c, so to avoid problems while
working on it, I just included it in the same list as xdisp.o.
Is a similar change may be needed in the w32 makefile?
--
Kim F. Storm <storm@cua.dk> http://www.cua.dk
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Move fringe.o to window-system specific lists of *.o files
2004-02-16 13:14 ` Kim F. Storm
@ 2004-02-16 16:19 ` Eli Zaretskii
0 siblings, 0 replies; 3+ messages in thread
From: Eli Zaretskii @ 2004-02-16 16:19 UTC (permalink / raw)
Cc: emacs-devel
> From: storm@cua.dk (Kim F. Storm)
> Date: 16 Feb 2004 14:14:51 +0100
>
> > Kim, any objections to the following change in src/Makefile.in?
>
> No, that is ok with me (and thank you for the fix). Pls. install it.
Done.
> Is a similar change may be needed in the w32 makefile?
No, the Windows port doesn't support a build without a window-system
code, like --without-x on Unix. So it always compiles and links
fringe.o.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-02-16 16:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-02-16 11:27 Move fringe.o to window-system specific lists of *.o files Eli Zaretskii
2004-02-16 13:14 ` Kim F. Storm
2004-02-16 16:19 ` Eli Zaretskii
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).