[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Move fringe.o to window-system specific lists of *.o files
From: |
Eli Zaretskii |
Subject: |
Move fringe.o to window-system specific lists of *.o files |
Date: |
Mon, 16 Feb 2004 13:27:09 +0200 |
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 \
- Move fringe.o to window-system specific lists of *.o files,
Eli Zaretskii <=