From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: "Eli Zaretskii" Newsgroups: gmane.emacs.devel Subject: Move fringe.o to window-system specific lists of *.o files Date: Mon, 16 Feb 2004 13:27:09 +0200 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <7137-Mon16Feb2004132709+0200-eliz@elta.co.il> Reply-To: Eli Zaretskii NNTP-Posting-Host: deer.gmane.org X-Trace: sea.gmane.org 1076931011 17761 80.91.224.253 (16 Feb 2004 11:30:11 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 16 Feb 2004 11:30:11 +0000 (UTC) Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Mon Feb 16 12:30:03 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1Asgwt-0001BC-00 for ; Mon, 16 Feb 2004 12:30:03 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1Asgws-0000DR-00 for ; Mon, 16 Feb 2004 12:30:02 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.24) id 1Asgv2-0000ym-0p for emacs-devel@quimby.gnus.org; Mon, 16 Feb 2004 06:28:08 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24) id 1AsguI-0000xo-FV for emacs-devel@gnu.org; Mon, 16 Feb 2004 06:27:22 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24) id 1Asgtl-0000p2-K7 for emacs-devel@gnu.org; Mon, 16 Feb 2004 06:27:20 -0500 Original-Received: from [192.114.186.18] (helo=bilbo.inter.net.il) by monty-python.gnu.org with esmtp (Exim 4.24) id 1Asgtk-0000oZ-Qz for emacs-devel@gnu.org; Mon, 16 Feb 2004 06:26:49 -0500 Original-Received: from zaretski (pns03-205-225.inter.net.il [80.230.205.225]) by bilbo.inter.net.il (MOS 3.4.4-GR) with ESMTP id CMA95700; Mon, 16 Feb 2004 13:26:45 +0200 (IST) Original-To: emacs-devel@gnu.org X-Mailer: emacs 21.3.50 (via feedmail 8 I) and Blat ver 1.8.9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.2 Precedence: list List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:19966 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:19966 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 \