X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/8edacacd994b7d2fcea73577793dcdb02bc59553..1398509c21ea8ab4ec8be1a445355c0b281dd04e:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index f473888cc5..3bc0123434 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,12 +1,12 @@ # Makefile for GNU Emacs. -# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 01, 03, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # This file is part of GNU Emacs. # GNU Emacs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # GNU Emacs is distributed in the hope that it will be useful, @@ -16,8 +16,8 @@ # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # Note that this file is edited by msdos/sed1v2.inp for MSDOS. That @@ -38,6 +38,7 @@ CPPFLAGS=@CPPFLAGS@ LDFLAGS=@LDFLAGS@ LN_S=@LN_S@ EXEEXT=@EXEEXT@ +version=@version@ # Substitute an assignment for the MAKE variable, because # BSD doesn't have it as a default. @SET_MAKE@ @@ -74,13 +75,13 @@ SHELL=/bin/sh #define NOT_C_CODE #include "config.h" -/* We won't really call alloca; - don't let the file name alloca.c get messed up. */ +/* We will not really call alloca; + do not let the file name alloca.c get messed up. */ #ifdef alloca #undef alloca #endif -/* Don't let the file name mktime.c get messed up. */ +/* Do not let the file name mktime.c get messed up. */ #ifdef mktime #undef mktime #endif @@ -95,7 +96,7 @@ SHELL=/bin/sh #endif /* On some machines #define register is done in config; - don't let it interfere with this file. */ + do not let it interfere with this file. */ #undef register /* On some systems we may not be able to use the system make command. */ @@ -115,7 +116,7 @@ CC = C_COMPILER #endif #endif -/* Some machines don't find the standard C libraries in the usual place. */ +/* Some machines do not find the standard C libraries in the usual place. */ #ifndef ORDINARY_LINK #ifndef LIB_STANDARD #define LIB_STANDARD -lc @@ -247,7 +248,7 @@ STARTFILES = START_FILES #endif /* not ORDINARY_LINK */ -/* cc switches needed to make `asm' keyword work. +/* cc switches needed to make ``asm'' keyword work. Nothing special needed on most machines. */ #ifndef C_SWITCH_ASM #define C_SWITCH_ASM @@ -276,11 +277,11 @@ TOOLKIT_DEFINES = for use in Emacs. -DHAVE_CONFIG_H is needed for some other files to take advantage of - the information in `config.h'. */ + the information in ``config.h''. */ /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM since it may have -I options that should override those two. */ -ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS} +ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_SITE C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${CFLAGS} .c.o: $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< @@ -304,16 +305,17 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(TOOLKIT_DEFINES) $(MYCPPFLAGS) -I. -I${srcd #define LIB_X11_LIB -lX11 #endif +/* xmenu.c should not be compiled on OSX. */ +#ifndef HAVE_CARBON +XMENU_OBJ = xmenu.o +#endif + #ifdef HAVE_X_WINDOWS XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o #ifdef HAVE_MENUS -#ifndef HAVE_CARBON -XMENU_OBJ = xmenu.o -#endif - #ifdef USE_GTK GTK_OBJ= gtkutil.o #endif @@ -335,7 +337,7 @@ LIBXMENU= -lXMenu #else /* not HAVE_MENUS */ -/* Otherwise, don't worry about the menu library at all. */ +/* Otherwise, do not worry about the menu library at all. */ LIBXMENU= #endif /* not HAVE_MENUS */ @@ -379,7 +381,7 @@ LIBXTR6 = -lSM -lICE #ifdef LIBXT_STATIC /* We assume the config files have defined STATIC_OPTION since that might depend on the operating system. - (Don't forget you need different definitions with and without __GNUC__.) */ + (Do not forget you need different definitions with and without __GNUC__.) */ LIBXT= STATIC_OPTION $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext DYNAMIC_OPTION #else /* not LIBXT_STATIC */ LIBXT= $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext @@ -400,6 +402,10 @@ LIBXT=$(LIBW) #endif #endif /* not USE_X_TOOLKIT */ +#if HAVE_XFT +XFT_LIBS=@XFT_LIBS@ +#endif /* HAVE_XFT */ + #if HAVE_XPM #ifndef LIBXPM #define LIBXPM -lXpm @@ -444,17 +450,15 @@ LIBXT=$(LIBW) /* LD_SWITCH_X_DEFAULT comes after everything else that specifies options for where to find X libraries, but before those libraries. */ X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT -LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM +LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM $(XFT_LIBS) #else /* not HAVE_X11 */ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM #endif /* not HAVE_X11 */ #else /* not HAVE_X_WINDOWS */ -#if defined(HAVE_MENUS) && !defined(HAVE_CARBON) -XMENU_OBJ = xmenu.o -#endif #endif /* not HAVE_X_WINDOWS */ LIBSOUND= @LIBSOUND@ +CFLAGS_SOUND= @CFLAGS_SOUND@ #ifndef ORDINARY_LINK /* Fix linking if compiled with GCC. */ @@ -469,9 +473,9 @@ LIBSOUND= @LIBSOUND@ /* Versions of GCC >= 2.0 put their library, libgcc.a, in obscure places that are difficult to figure out at make time. Fortunately, these same versions allow you to pass arbitrary flags on to the - linker, so there's no reason not to use it as a linker. + linker, so there is no reason not to use it as a linker. - Well, it's not quite perfect. The `-nostdlib' keeps GCC from + Well, it is not quite perfect. The "-nostdlib" keeps GCC from searching for libraries in its internal directories, so we have to ask GCC explicitly where to find libgcc.a. */ @@ -488,9 +492,9 @@ GNULIB_VAR = LIB_GCC #ifndef LINKER_WAS_SPECIFIED /* GCC passes any argument prefixed with -Xlinker directly to the - linker. See prefix-args.c for an explanation of why we don't do - this with the shell's `for' construct. - Note that some people don't have '.' in their paths, so we must + linker. See prefix-args.c for an explanation of why we do not do + this with the shell''s ``for'' construct. + Note that some people do not have '.' in their paths, so we must use ./prefix-args. */ #define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags` #else @@ -531,12 +535,12 @@ LD=ld #endif /* not ORDINARY_LINK */ /* Flags to pass to LD only for temacs. */ -/* Don't split this line with a backslash. That can cause trouble with +/* Do not split this line with a backslash. That can cause trouble with some cpps. */ TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE /* A macro which other sections of Makefile can redefine to munge the - flags before they're passed to LD. This is helpful if you have + flags before they are passed to LD. This is helpful if you have redefined LD to something odd, like "gcc". (The YMF prefix is a holdover from the old name "ymakefile".) */ @@ -570,7 +574,7 @@ CYGWIN_OBJ = sheap.o #ifdef HAVE_CARBON mac = $(dot)$(dot)/mac/ -MAC_OBJ = mac.o macterm.o macfns.o macmenu.o fontset.o fringe.o image.o +MAC_OBJ = mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o fringe.o image.o emacsapp = $(PWD)/$(mac)Emacs.app/ emacsappsrc = ${srcdir}/../mac/Emacs.app/ #endif @@ -596,8 +600,10 @@ obj= dispnew.o frame.o scroll.o xdisp.o $(XMENU_OBJ) window.o \ These go in the DOC file on all machines in case they are needed there. */ SOME_MACHINE_OBJECTS = sunfns.o dosfns.o msdos.o \ - xterm.o xfns.o xmenu.o xselect.o xrdb.o \ - mac.o macterm.o macfns.o macmenu.o fontset.o + xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ + mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ + w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ + w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o #ifdef TERMINFO @@ -676,6 +682,20 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO #define MSDOS_SUPPORT #endif +#ifdef HAVE_WINDOW_SYSTEM +#ifdef HAVE_X_WINDOWS +#define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \ + ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ + ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc +#else +#define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \ + ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ + ${lispsource}tool-bar.elc ${lispsource}mwheel.elc +#endif +#else +#define WINDOW_SUPPORT +#endif + #ifdef WINDOWSNT #define WINNT_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ ${lispsource}dos-w32.elc ${lispsource}w32-vars.elc \ @@ -684,8 +704,14 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO #define WINNT_SUPPORT #endif -/* List of Lisp files loaded into the dumped Emacs. It's arranged - like this because it's easier to generate it semi-mechanically from +#ifdef HAVE_WINDOW_SYSTEM +#define TOOLTIP_SUPPORT ${lispsource}tooltip.elc +#else +#define TOOLTIP_SUPPORT +#endif + +/* List of Lisp files loaded into the dumped Emacs. It is arranged + like this because it is easier to generate it semi-mechanically from loadup.el this way. Note that this list should not include lisp files which might not @@ -718,6 +744,7 @@ lisp= \ ${lispsource}help.elc \ ${lispsource}indent.elc \ ${lispsource}isearch.elc \ + ${lispsource}rfn-eshadow.elc \ ${lispsource}loadup.el \ ${lispsource}loaddefs.el \ ${lispsource}bindings.elc \ @@ -770,16 +797,22 @@ lisp= \ ${lispsource}subr.elc \ ${lispsource}term/tty-colors.elc \ ${lispsource}font-core.elc \ + ${lispsource}emacs-lisp/syntax.elc \ + ${lispsource}font-lock.elc \ + ${lispsource}jit-lock.elc \ ${lispsource}textmodes/fill.elc \ ${lispsource}textmodes/page.elc \ ${lispsource}textmodes/paragraphs.elc \ ${lispsource}textmodes/text-mode.elc \ ${lispsource}emacs-lisp/timer.elc \ + ${lispsource}jka-cmpr-hook.elc \ ${lispsource}vc-hooks.elc \ ${lispsource}ediff-hook.elc \ + TOOLTIP_SUPPORT \ VMS_SUPPORT \ MSDOS_SUPPORT \ WINNT_SUPPORT \ + WINDOW_SUPPORT \ ${lispsource}widget.elc \ ${lispsource}window.elc \ ${lispsource}version.el @@ -808,6 +841,7 @@ shortlisp= \ ../lisp/help.elc \ ../lisp/indent.elc \ ../lisp/isearch.elc \ + ../lisp/rfn-eshadow.elc \ ../lisp/loadup.el \ ../lisp/loaddefs.el \ ../lisp/bindings.elc \ @@ -861,12 +895,16 @@ shortlisp= \ ../lisp/subr.elc \ ../lisp/term/tty-colors.elc \ ../lisp/font-core.elc \ + ../lisp/emacs-lisp/syntax.elc \ + ../lisp/font-lock.elc \ + ../lisp/jit-lock.elc \ ../lisp/textmodes/fill.elc \ ../lisp/textmodes/page.elc \ ../lisp/textmodes/paragraphs.elc \ ../lisp/textmodes/text-mode.elc \ ../lisp/emacs-lisp/timer.elc \ ../lisp/vc-hooks.elc \ + ../lisp/jka-cmpr-hook.elc \ ../lisp/ediff-hook.elc \ ../lisp/widget.elc \ ../lisp/window.elc \ @@ -876,15 +914,20 @@ shortlisp= \ We must unconditionally put them in the DOC file. We use ../lisp/ to start the file names to reduce the size of the argument list for make-docfile - for the sake of systems which can\'t handle large ones. */ + for the sake of systems which can''t handle large ones. */ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \ ${dotdot}/lisp/select.elc ${dotdot}/lisp/scroll-bar.elc \ ${dotdot}/lisp/vmsproc.elc ${dotdot}/lisp/vms-patch.elc \ ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \ ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \ ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \ + ${dotdot}/lisp/tooltip.elc ${dotdot}/lisp/image.elc \ + ${dotdot}/lisp/fringe.elc ${dotdot}/lisp/dnd.elc \ + ${dotdot}/lisp/mwheel.elc ${dotdot}/lisp/tool-bar.elc \ + ${dotdot}/lisp/x-dnd.elc \ ${dotdot}/lisp/international/ccl.elc \ - ${dotdot}/lisp/international/codepage.elc + ${dotdot}/lisp/international/codepage.elc \ + ${dotdot}/lisp/international/fontset.elc /* Construct full set of libraries to be linked. Note that SunOS needs -lm to come before -lc; otherwise, you get @@ -905,6 +948,8 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) \ #define OBJECTS_MACHINE #endif +RUN_TEMACS = ./temacs + all: emacs${EXEEXT} OTHER_FILES emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} @@ -913,9 +958,9 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ln temacs${EXEEXT} emacs${EXEEXT} #else #ifdef HAVE_SHM - LC_ALL=C ./temacs -nl -batch -l loadup dump + LC_ALL=C $(RUN_TEMACS) -nl -batch -l loadup dump #else /* ! defined (HAVE_SHM) */ - LC_ALL=C ./temacs -batch -l loadup dump + LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump #endif /* ! defined (HAVE_SHM) */ #endif /* ! defined (CANNOT_DUMP) */ -./emacs -q -batch -f list-load-path-shadows @@ -942,22 +987,23 @@ ${libsrc}make-docfile${EXEEXT}: #endif temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT} + echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ -o temacs ${STARTFILES} ${obj} ${otherobj} \ OBJECTS_MACHINE ${LIBES} -/* We don't use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE - often contain options that have to do with using Emacs's crt0, +/* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE + often contain options that have to do with using Emacs''s crt0, which are only good with temacs. */ prefix-args${EXEEXT}: prefix-args.c $(config_h) $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args -/* Don't lose if this was not defined. */ +/* Do not lose if this was not defined. */ #ifndef OLDXMENU_OPTIONS #define OLDXMENU_OPTIONS #endif -#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) +#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK) /* We use stamp-xmenu with these two deps to both ensure that lwlib gets remade based on its dependencies @@ -1013,12 +1059,12 @@ really-oldXMenu: @true /* make -t should not create really-oldXMenu. */ .PHONY: really-oldXMenu #endif /* not USE_X_TOOLKIT */ -#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */ +#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */ -/* We don\'t really need this, but satisfy the dependency. */ +/* We don''t really need this, but satisfy the dependency. */ stamp-oldxmenu: touch stamp-oldxmenu -#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */ +#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */ ../config.status:: epaths.in @echo "The file epaths.h needs to be set up from epaths.in." @@ -1034,7 +1080,7 @@ stamp-oldxmenu: They should define HAVE_ALLOCA. Some use the C version in alloca.c (these define C_ALLOCA in config.h). */ -alloca.o: alloca.c blockinput.h atimer.h +alloca.o: alloca.c blockinput.h atimer.h systime.h /* Nearly all the following files depend on lisp.h, but it is not included as a dependency because @@ -1042,50 +1088,54 @@ alloca.o: alloca.c blockinput.h atimer.h and so rarely changed in ways that do require any. */ abbrev.o: abbrev.c buffer.h window.h dispextern.h commands.h charset.h \ - $(config_h) + syntax.h $(config_h) buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \ dispextern.h $(INTERVAL_SRC) blockinput.h atimer.h systime.h charset.h \ $(config_h) -callint.o: callint.c window.h commands.h buffer.h \ +callint.o: callint.c window.h commands.h buffer.h keymap.h \ keyboard.h dispextern.h $(config_h) callproc.o: callproc.c epaths.h buffer.h commands.h $(config_h) \ process.h systty.h syssignal.h charset.h coding.h ccl.h msdos.h \ - composite.h -casefiddle.o: casefiddle.c syntax.h commands.h buffer.h composite.h $(config_h) + composite.h w32.h blockinput.h atimer.h systime.h +casefiddle.o: casefiddle.c syntax.h commands.h buffer.h composite.h \ + charset.h keymap.h $(config_h) casetab.o: casetab.c buffer.h $(config_h) -category.o: category.c category.h buffer.h charset.h $(config_h) +category.o: category.c category.h buffer.h charset.h keymap.h $(config_h) ccl.o: ccl.c ccl.h charset.h coding.h $(config_h) charset.o: charset.c charset.h buffer.h coding.h composite.h disptab.h \ $(config_h) -coding.o: coding.c coding.h ccl.h buffer.h charset.h intervals.h composite.h window.h $(config_h) +coding.o: coding.c coding.h ccl.h buffer.h charset.h intervals.h composite.h \ + window.h dispextern.h $(config_h) cm.o: cm.c cm.h termhooks.h $(config_h) cmds.o: cmds.c syntax.h buffer.h charset.h commands.h window.h $(config_h) \ - msdos.h dispextern.h + msdos.h dispextern.h keyboard.h keymap.h pre-crt0.o: pre-crt0.c ecrt0.o: ecrt0.c $(config_h) CRT0_COMPILE ${srcdir}/ecrt0.c dired.o: dired.c commands.h buffer.h $(config_h) charset.h coding.h regex.h \ - systime.h + systime.h blockinput.h atimer.h dispnew.o: dispnew.c systty.h systime.h commands.h process.h frame.h \ window.h buffer.h dispextern.h termchar.h termopts.h termhooks.h cm.h \ - disptab.h \ + disptab.h indent.h intervals.h \ xterm.h blockinput.h atimer.h charset.h msdos.h composite.h keyboard.h \ $(config_h) -doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h charset.h +doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h keymap.h charset.h doprnt.o: doprnt.c charset.h $(config_h) -dosfns.o: buffer.h termchar.h termhooks.h frame.h msdos.h dosfns.h $(config_h) +dosfns.o: buffer.h termchar.h termhooks.h frame.h blockinput.h window.h \ + msdos.h dosfns.h dispextern.h charset.h coding.h atimer.h systime.h \ + $(config_h) editfns.o: editfns.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \ - coding.h dispextern.h $(config_h) + coding.h dispextern.h frame.h blockinput.h atimer.h $(config_h) emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \ termhooks.h buffer.h atimer.h systime.h $(INTERVAL_SRC) $(config_h) \ - window.h keyboard.h keymap.h + window.h dispextern.h keyboard.h keymap.h fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \ - coding.h ccl.h msdos.h dispextern.h $(config_h) -filelock.o: filelock.c buffer.h systime.h epaths.h $(config_h) + coding.h msdos.h dispextern.h blockinput.h atimer.h $(config_h) +filelock.o: filelock.c buffer.h charset.h coding.h systime.h epaths.h $(config_h) filemode.o: filemode.c $(config_h) frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \ blockinput.h atimer.h systime.h buffer.h charset.h fontset.h \ - msdos.h dosfns.h dispextern.h $(config_h) + msdos.h dosfns.h dispextern.h w32term.h macterm.h $(config_h) fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h) fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \ keyboard.h $(config_h) @@ -1096,13 +1146,14 @@ indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \ termopts.h disptab.h region-cache.h charset.h composite.h dispextern.h \ keyboard.h insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.h \ - dispextern.h atimer.h systime.h $(config_h) + dispextern.h atimer.h systime.h region-cache.h $(config_h) keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h charset.h \ commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \ systty.h systime.h dispextern.h syntax.h $(INTERVAL_SRC) blockinput.h \ - atimer.h xterm.h puresize.h msdos.h $(config_h) + atimer.h xterm.h puresize.h msdos.h keymap.h w32term.h macterm.h $(config_h) keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \ - atimer.h systime.h puresize.h charset.h intervals.h $(config_h) + atimer.h systime.h puresize.h charset.h intervals.h keymap.h window.h \ + $(config_h) lastfile.o: lastfile.c $(config_h) macros.o: macros.c window.h buffer.h commands.h macros.h keyboard.h \ dispextern.h $(config_h) @@ -1113,11 +1164,11 @@ vm-limit.o: vm-limit.c mem-limits.h $(config_h) marker.o: marker.c buffer.h charset.h $(config_h) md5.o: md5.c md5.h $(config_h) minibuf.o: minibuf.c syntax.h dispextern.h frame.h window.h keyboard.h \ - buffer.h commands.h charset.h msdos.h $(config_h) + buffer.h commands.h charset.h msdos.h $(INTERVAL_SRC) keymap.h $(config_h) mktime.o: mktime.c $(config_h) msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \ termopts.h termchar.h charset.h coding.h ccl.h disptab.h window.h \ - keyboard.h intervals.h $(config_h) + keyboard.h intervals.h buffer.h commands.h blockinput.h atimer.h $(config_h) process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \ commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \ blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \ @@ -1127,35 +1178,40 @@ region-cache.o: region-cache.c buffer.h region-cache.h $(config_h) scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h keyboard.h \ $(config_h) search.o: search.c regex.h commands.h buffer.h region-cache.h syntax.h \ - blockinput.h atimer.h systime.h category.h charset.h composite.h $(config_h) + blockinput.h atimer.h systime.h category.h charset.h composite.h \ + $(INTERVAL_SRC) $(config_h) strftime.o: strftime.c $(config_h) syntax.o: syntax.c syntax.h buffer.h commands.h category.h charset.h \ - composite.h $(config_h) + composite.h keymap.h regex.h $(INTERVAL_SRC) $(config_h) sysdep.o: sysdep.c syssignal.h systty.h systime.h syswait.h blockinput.h \ process.h dispextern.h termhooks.h termchar.h termopts.h \ frame.h atimer.h window.h msdos.h dosfns.h keyboard.h $(config_h) term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \ - disptab.h dispextern.h keyboard.h charset.h coding.h ccl.h msdos.h + disptab.h dispextern.h keyboard.h charset.h coding.h ccl.h msdos.h \ + window.h keymap.h blockinput.h atimer.h systime.h termcap.o: termcap.c $(config_h) terminfo.o: terminfo.c $(config_h) tparam.o: tparam.c $(config_h) -undo.o: undo.c buffer.h commands.h $(config_h) +undo.o: undo.c buffer.h commands.h window.h $(config_h) /* This hack is to discard any space that cpp might put at the beginning of UNEXEC when substituting it in. */ UNEXEC_ALIAS=UNEXEC $(UNEXEC_ALIAS): UNEXEC_SRC $(config_h) w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.h \ - msdos.h $(config_h) + msdos.h buffer.h charset.h coding.h composite.h $(config_h) widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \ $(srcdir)/../lwlib/lwlib.h $(config_h) window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \ termhooks.h disptab.h keyboard.h dispextern.h msdos.h composite.h \ - $(config_h) + keymap.h blockinput.h atimer.h systime.h $(INTERVAL_SRC) \ + xterm.h w32term.h macterm.h $(config_h) xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h coding.h \ termchar.h frame.h window.h disptab.h termhooks.h charset.h $(config_h) \ + keyboard.h $(INTERVAL_SRC) region-cache.h xterm.h w32term.h macterm.h \ msdos.h composite.h fontset.h blockinput.h atimer.h systime.h keymap.h xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \ - window.h charset.h msdos.h dosfns.h composite.h atimer.h systime.h $(config_h) + window.h charset.h msdos.h dosfns.h composite.h atimer.h systime.h \ + keyboard.h fontset.h w32term.h macterm.h $(INTERVAL_SRC) $(config_h) xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \ $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h epaths.h \ charset.h gtkutil.h $(config_h) @@ -1172,7 +1228,8 @@ xrdb.o: xrdb.c $(config_h) epaths.h xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h xterm.h \ lisp.h termopts.h gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h $(config_h) \ - blockinput.h window.h atimer.h termhooks.h keyboard.h charset.h coding.h + blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \ + charset.h coding.h hftctl.o: hftctl.c $(config_h) sound.o: sound.c dispextern.h $(config_h) @@ -1182,22 +1239,27 @@ atimer.o: atimer.c atimer.h systime.h $(config_h) alloc.o: alloc.c process.h frame.h window.h buffer.h puresize.h syssignal.h keyboard.h \ blockinput.h atimer.h systime.h charset.h dispextern.h $(config_h) $(INTERVAL_SRC) -bytecode.o: bytecode.c buffer.h syntax.h charset.h window.h $(config_h) -data.o: data.c buffer.h puresize.h charset.h syssignal.h keyboard.h $(config_h) +bytecode.o: bytecode.c buffer.h syntax.h charset.h window.h dispextern.h \ + frame.h xterm.h $(config_h) +data.o: data.c buffer.h puresize.h charset.h syssignal.h keyboard.h frame.h $(config_h) eval.o: eval.c commands.h keyboard.h blockinput.h atimer.h systime.h \ dispextern.h $(config_h) floatfns.o: floatfns.c $(config_h) fns.o: fns.c commands.h $(config_h) frame.h buffer.h charset.h keyboard.h \ - frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h + keymap.h frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h \ + blockinput.h atimer.h systime.h xterm.h print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.h \ - $(config_h) dispextern.h msdos.h composite.h -lread.o: lread.c commands.h keyboard.h buffer.h epaths.h charset.h $(config_h) \ - termhooks.h coding.h msdos.h + $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h \ + blockinput.h atimer.h systime.h +lread.o: lread.c commands.h keyboard.h buffer.h epaths.h charset.h \ + $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h blockinput.h \ + atimer.h systime.h /* Text properties support */ textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVAL_SRC) \ $(config_h) -intervals.o: intervals.c buffer.h $(INTERVAL_SRC) keyboard.h puresize.h $(config_h) +intervals.o: intervals.c buffer.h $(INTERVAL_SRC) keyboard.h puresize.h \ + keymap.h $(config_h) composite.o: composite.c buffer.h charset.h $(INTERVAL_SRC) $(config_h) /* System-specific programs to be made. @@ -1211,16 +1273,19 @@ abbrev.o buffer.o callint.o cmds.o dispnew.o editfns.o fileio.o frame.o \ fontset.o indent.o insdel.o keyboard.o macros.o minibuf.o msdos.o process.o \ scroll.o sysdep.o term.o widget.o window.o xdisp.o xfaces.o xfns.o xmenu.o \ xterm.o xselect.o sound.o: macgui.h -mac.o: mac.c process.h sysselect.h systime.h $(config_h) +mac.o: mac.c process.h sysselect.h blockinput.h atimer.h systime.h charset.h \ + coding.h ccl.h $(config_h) macfns.o: macfns.c charset.h macterm.h macgui.h frame.h window.h buffer.h \ dispextern.h macgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \ - atimer.h systime.h epaths.h termhooks.h coding.h ccl.h systime.h $(config_h) + atimer.h systime.h epaths.h termhooks.h coding.h $(config_h) macmenu.o: macmenu.c termhooks.h frame.h window.h dispextern.h macgui.h \ keyboard.h blockinput.h atimer.h systime.h buffer.h macterm.h $(config_h) macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \ frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \ termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ process.h coding.h $(config_h) +macselect.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \ + keymap.h $(config_h) ${emacsapp}Contents/Resources/English.lproj: mkdir -p $@ @@ -1241,25 +1306,21 @@ macosx-bundle: ${emacsapp}Contents/Resources/English.lproj \ ${emacsapp}Contents/Info.plist ${emacsapp}Contents/PkgInfo \ ${emacsapp}Contents/Resources/Emacs.icns \ ${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings -macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs \ - ${emacsapp}Contents/Resources/Emacs.rsrc +macosx-app: macosx-bundle ${emacsapp}Contents/MacOS/Emacs ${emacsapp}Contents/MacOS/Emacs: emacs${EXEEXT} mkdir -p ${emacsapp}Contents/MacOS/; cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs${EXEEXT} Emacs${EXEEXT} -${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r - /Developer/Tools/Rez -useDF \ - -o ${emacsapp}Contents/Resources/Emacs.rsrc \ - /System/Library/Frameworks/Carbon.framework/Headers/Carbon.r $< #endif ${libsrc}emacstool${EXEEXT}: ${libsrc}emacstool.c cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool${EXEEXT} bootstrapclean: - rm -f bootstrap-emacs${EXEEXT} + rm -f bootstrap-emacs${EXEEXT} emacs-${version}${EXEEXT} mostlyclean: rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a rm -f ../etc/DOC - rm -f bootstrap-emacs${EXEEXT} + rm -f bootstrap-emacs${EXEEXT} emacs-${version}${EXEEXT} + rm -f buildobj.lst clean: mostlyclean rm -f emacs-*${EXEEXT} emacs${EXEEXT} /**/# This is used in making a distribution. @@ -1322,9 +1383,9 @@ bootstrap-emacs${EXEEXT}: temacs${EXEEXT} ln temacs${EXEEXT} bootstrap-emacs${EXEEXT} #else #ifdef HAVE_SHM - ./temacs -nl -batch -l loadup bootstrap + $(RUN_TEMACS) -nl -batch -l loadup bootstrap #else /* ! defined (HAVE_SHM) */ - ./temacs --batch --load loadup bootstrap + $(RUN_TEMACS) --batch --load loadup bootstrap #endif /* ! defined (HAVE_SHM) */ mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} #endif /* ! defined (CANNOT_DUMP) */