X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6412427914cf7a4f139d6935881584002b047220..a8a3728b90d75d89368be8e35d5c26468e071d5c:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index d4beca76ae..14f0c8a51f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,6 +1,6 @@ # Makefile for GNU Emacs. # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -52,7 +52,6 @@ version=@version@ LIBOBJS = @LIBOBJS@ lispsource = ${srcdir}/../lisp/ -admindir = $(srcdir)/../admin/ libsrc = ../lib-src/ etc = ../etc/ oldXMenudir = ../oldXMenu/ @@ -94,11 +93,6 @@ SHELL=/bin/sh do not let it interfere with this file. */ #undef register -/* On some systems we may not be able to use the system make command. */ -#ifdef MAKE_COMMAND -MAKE = MAKE_COMMAND -#endif - /* GNU libc requires ORDINARY_LINK so that its own crt0 is used. GNU/Linux is an exception because it uses a funny variant of GNU libc. */ #ifdef __GNU_LIBRARY__ @@ -118,6 +112,12 @@ MAKE = MAKE_COMMAND #endif #endif +/* Under GNUstep, putting libc on the link line causes problems. */ +#ifdef NS_IMPL_GNUSTEP +#undef LIB_STANDARD +#define LIB_STANDARD +#endif + /* Unless inhibited or changed, use -lg to link for debugging. */ #ifndef LIBS_DEBUG #define LIBS_DEBUG -lg @@ -200,16 +200,6 @@ MAKE = MAKE_COMMAND #define LD_SWITCH_X_DEFAULT #endif -/* These can be passed in from config.h to define special load and - compile switches needed by individual sites */ -#ifndef LD_SWITCH_SITE -#define LD_SWITCH_SITE -#endif - -#ifndef C_SWITCH_SITE -#define C_SWITCH_SITE -#endif - #ifndef ORDINARY_LINK #ifndef CRT0_COMPILE @@ -235,6 +225,15 @@ STARTFILES = START_FILES #endif /* not ORDINARY_LINK */ +#ifdef NS_IMPL_GNUSTEP +/* Pull in stuff from GNUstep-make. */ +FOUNDATION_LIB=gnu +GUI_LIB=gnu +include @GNUSTEP_MAKEFILES@/Additional/base.make +include @GNUSTEP_MAKEFILES@/Additional/gui.make +shared=no +#endif + #ifdef HAVE_DBUS DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ @@ -254,9 +253,14 @@ DBUS_OBJ = dbusbind.o /* 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 $(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} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ +ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ +ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@ + +.SUFFIXES: .m .c.o: $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< +.m.o: + $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< #ifndef LIBX11_SYSTEM #define LIBX11_SYSTEM @@ -266,13 +270,8 @@ ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHIN #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 - +XMENU_OBJ = xmenu.o XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o #ifdef HAVE_MENUS @@ -402,7 +401,6 @@ LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM L #else /* not HAVE_X11 */ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE #endif /* not HAVE_X11 */ -#else /* not HAVE_X_WINDOWS */ #endif /* not HAVE_X_WINDOWS */ #if HAVE_GPM @@ -485,7 +483,7 @@ LD=ld /* Flags to pass to LD only for temacs. */ /* 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 +TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS /* A macro which other sections of Makefile can redefine to munge the flags before they are passed to LD. This is helpful if you have @@ -500,19 +498,16 @@ TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_S #ifndef UNEXEC #define UNEXEC unexec.o #endif -#ifndef UNEXEC_SRC -#define UNEXEC_SRC unexec.c -#endif -INTERVAL_SRC = intervals.h composite.h +INTERVALS_H = dispextern.h intervals.h composite.h GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ #ifdef MSDOS #ifdef HAVE_X_WINDOWS -MSDOS_OBJ = dosfns.o msdos.o +MSDOS_OBJ = dosfns.o msdos.o xmenu.o #else -MSDOS_OBJ = dosfns.o msdos.o w16select.o +MSDOS_OBJ = dosfns.o msdos.o w16select.o xmenu.o #endif #endif @@ -520,12 +515,15 @@ MSDOS_OBJ = dosfns.o msdos.o w16select.o CYGWIN_OBJ = sheap.o #endif -#ifdef HAVE_CARBON -mac = ../mac/ -MAC_OBJ = mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o fringe.o image.o mactoolbox.o -emacsapp = $(PWD)/$(mac)Emacs.app/ -emacsappsrc = ${srcdir}/../mac/Emacs.app/ -#endif +#ifdef HAVE_NS +ns_appdir=@ns_appdir@/ +ns_appbindir=@ns_appbindir@/ +ns_appresdir=@ns_appresdir@/ +ns_appsrc=@ns_appsrc@ +/* Object files for NeXTstep */ +NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ + fontset.o fringe.o image.o +#endif /* HAVE_NS */ #ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_X_WINDOWS @@ -554,15 +552,16 @@ obj= dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \ process.o callproc.o \ region-cache.o sound.o atimer.o \ doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \ - $(MSDOS_OBJ) $(MAC_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS) + $(MSDOS_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_DRIVERS) /* Object files used on some machine or other. These go in the DOC file on all machines in case they are needed there. */ SOME_MACHINE_OBJECTS = dosfns.o msdos.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 \ + fontset.o \ + nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ + w32.o w32console.o w32fns.o w32heap.o w32inevt.o \ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS) @@ -625,16 +624,9 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS) #endif #endif -#ifdef VMS -#define VMS_SUPPORT ${lispsource}vmsproc.elc ${lispsource}vms-patch.elc -#else -#define VMS_SUPPORT -#endif - #ifdef MSDOS #define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ - ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \ - ${lispsource}international/ccl.elc ${lispsource}international/codepage.elc + ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc #else #define MSDOS_SUPPORT @@ -680,7 +672,11 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(widgetobj) $(LIBOBJS) Files included conditionally here should be included (unconditionally) in SOME_MACHINE_LISP. */ +/* Place loaddefs.el first, so it gets generated first, since it is on + the critical path (relevant in parallel compilations). */ + lisp= \ + ${lispsource}loaddefs.el \ ${lispsource}abbrev.elc \ ${lispsource}buff-menu.elc \ ${lispsource}button.elc \ @@ -705,7 +701,6 @@ lisp= \ ${lispsource}isearch.elc \ ${lispsource}rfn-eshadow.elc \ ${lispsource}loadup.el \ - ${lispsource}loaddefs.el \ ${lispsource}bindings.elc \ ${lispsource}emacs-lisp/map-ynp.elc \ ${lispsource}menu-bar.elc \ @@ -762,7 +757,6 @@ lisp= \ ${lispsource}ediff-hook.elc \ ${lispsource}epa-hook.elc \ TOOLTIP_SUPPORT \ - VMS_SUPPORT \ MSDOS_SUPPORT \ WINNT_SUPPORT \ WINDOW_SUPPORT \ @@ -775,6 +769,7 @@ lisp= \ It need not contain the files that are loaded conditionally because SOME_MACHINE_LISP has those. */ shortlisp= \ + ../lisp/loaddefs.el \ ../lisp/abbrev.elc \ ../lisp/buff-menu.elc \ ../lisp/button.elc \ @@ -797,7 +792,6 @@ shortlisp= \ ../lisp/isearch.elc \ ../lisp/rfn-eshadow.elc \ ../lisp/loadup.el \ - ../lisp/loaddefs.el \ ../lisp/bindings.elc \ ../lisp/emacs-lisp/map-ynp.elc \ ../lisp/env.elc \ @@ -864,7 +858,6 @@ shortlisp= \ for the sake of systems which can''t handle large ones. */ SOME_MACHINE_LISP = ../lisp/mouse.elc \ ../lisp/select.elc ../lisp/scroll-bar.elc \ - VMS_SUPPORT \ ../lisp/ls-lisp.elc ../lisp/dos-fns.elc \ ../lisp/w32-fns.elc ../lisp/dos-w32.elc \ ../lisp/disp-table.elc ../lisp/dos-vars.elc \ @@ -873,15 +866,17 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \ ../lisp/mwheel.elc ../lisp/tool-bar.elc \ ../lisp/x-dnd.elc \ ../lisp/international/ccl.elc \ - ../lisp/international/codepage.elc \ ../lisp/international/fontset.elc \ ../lisp/mouse.elc \ - ../lisp/term/x-win.elc + ../lisp/term/x-win.elc \ + ../lisp/term/pc-win.elc \ + ../lisp/term/ns-win.elc /* Construct full set of libraries to be linked. Note that SunOS needs -lm to come before -lc; otherwise, you get duplicated symbols. If the standard libraries were compiled with GCC, we might need gnulib again after them. */ + LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) $(DBUS_LIBS) \ LIBGPM LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ LIBS_DEBUG $(GETLOADAVG_LIBS) \ @@ -926,7 +921,12 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ${SOME_MACHINE_LISP} for the first time, this prevents any variation between configurations in the contents of the DOC file. Likewise for ${SOME_MACHINE_LISP}. */ -${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${shortlisp} ${SOME_MACHINE_LISP} +/* Most of this Makefile refers to Lisp files via ${lispsource}, so + we also use ${lisp} rather than ${shortlisp} for the dependency since + the Makefile uses string equality to decide when we talk about identical + files. Apparently we pass ${shortlisp} rather than ${lisp} to make-docfile + only in order to reduce the command line length. --Stef */ +${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${lisp} ${SOME_MACHINE_LISP} -rm -f ${etc}DOC ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp} @@ -936,9 +936,16 @@ ${libsrc}make-docfile${EXEEXT}: temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT} echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst +#ifdef NS_IMPL_GNUSTEP + $(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \ + -L@GNUSTEP_SYSTEM_LIBRARIES@ -lgnustep-gui -lgnustep-base \ + -lobjc $(CONFIG_SYSTEM_LIBS) -lpthread ) -o temacs \ + ${obj} ${otherobj} OBJECTS_MACHINE ${LIBES} +#else $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ -o temacs ${STARTFILES} ${obj} ${otherobj} \ OBJECTS_MACHINE ${LIBES} +#endif /* 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, @@ -961,7 +968,6 @@ stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU) so we can use $(...) to substitute their values within "...". */ C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE C_SWITCH_SYSTEM_1 = C_SWITCH_SYSTEM -C_SWITCH_SITE_1 = C_SWITCH_SITE C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM @@ -975,7 +981,6 @@ really-lwlib: "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \ "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \ "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \ - "C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \ "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \ "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)" @true /* make -t should not create really-lwlib. */ @@ -989,7 +994,6 @@ really-oldXMenu: "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \ "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \ "C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \ - "C_SWITCH_SITE=$(C_SWITCH_SITE_1)" \ "C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \ "C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)" @true /* make -t should not create really-oldXMenu. */ @@ -1017,10 +1021,11 @@ stamp-oldxmenu: it is so often changed in ways that do not require any recompilation and so rarely changed in ways that do require any. */ +atimer.o: atimer.c atimer.h syssignal.h systime.h $(config_h) abbrev.o: abbrev.c buffer.h window.h dispextern.h commands.h character.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 character.h \ + dispextern.h $(INTERVALS_H) blockinput.h atimer.h systime.h character.h \ $(config_h) callint.o: callint.c window.h commands.h buffer.h keymap.h \ keyboard.h dispextern.h $(config_h) @@ -1035,11 +1040,11 @@ category.o: category.c category.h buffer.h charset.h keymap.h \ character.h $(config_h) ccl.o: ccl.c ccl.h charset.h character.h coding.h $(config_h) character.o: character.c character.h buffer.h charset.h composite.h disptab.h \ - $(config.h) + $(config_h) charset.o: charset.c charset.h character.h buffer.h coding.h composite.h \ disptab.h $(config_h) -chartab.o: charset.h character.h $(config.h) -coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h intervals.h composite.h \ +chartab.o: charset.h character.h $(config_h) +coding.o: coding.c coding.h ccl.h buffer.h character.h charset.h $(INTERVALS_H) composite.h \ window.h dispextern.h frame.h termhooks.h $(config_h) cm.o: cm.c frame.h cm.h termhooks.h termchar.h $(config_h) cmds.o: cmds.c syntax.h buffer.h character.h commands.h window.h $(config_h) \ @@ -1047,52 +1052,59 @@ cmds.o: cmds.c syntax.h buffer.h character.h commands.h window.h $(config_h) \ pre-crt0.o: pre-crt0.c ecrt0.o: ecrt0.c $(config_h) CRT0_COMPILE ${srcdir}/ecrt0.c +dbusbind.o: dbusbind.c termhooks.h frame.h keyboard.h $(config_h) dired.o: dired.c commands.h buffer.h $(config_h) character.h charset.h \ coding.h regex.h systime.h blockinput.h atimer.h dispnew.o: dispnew.c systime.h commands.h process.h frame.h \ window.h buffer.h dispextern.h termchar.h termopts.h termhooks.h cm.h \ - disptab.h indent.h intervals.h \ + disptab.h indent.h $(INTERVALS_H) \ xterm.h blockinput.h atimer.h character.h msdos.h composite.h keyboard.h \ - $(config_h) + syssignal.h $(config_h) doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h keymap.h character.h doprnt.o: doprnt.c character.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) character.h \ +editfns.o: editfns.c window.h buffer.h systime.h $(INTERVALS_H) character.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) \ + termhooks.h buffer.h atimer.h systime.h $(INTERVALS_H) $(config_h) \ window.h dispextern.h keyboard.h keymap.h -fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) character.h \ +fileio.o: fileio.c window.h buffer.h systime.h $(INTERVALS_H) character.h \ coding.h msdos.h dispextern.h blockinput.h atimer.h $(config_h) filelock.o: filelock.c buffer.h character.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 character.h fontset.h font.h \ - msdos.h dosfns.h dispextern.h w32term.h macterm.h termchar.h $(config_h) + blockinput.h atimer.h systime.h buffer.h character.h fontset.h font.h \ + msdos.h dosfns.h dispextern.h w32term.h termchar.h \ + $(config_h) fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h $(config_h) font.o: font.c dispextern.h frame.h window.h ccl.h character.h charset.h \ font.h $(config_h) -ftfont.o: dispextern.h frame.h character.h charset.h font.h $(config_h) +ftfont.o: dispextern.h frame.h character.h charset.h composite.h font.h \ + $(config_h) fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h character.h \ charset.h frame.h keyboard.h termhooks.h font.h $(config_h) getloadavg.o: getloadavg.c $(config_h) +gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h $(config_h) \ + blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \ + charset.h coding.h syssignal.h image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \ - systime.h xterm.h w32term.h w32gui.h macterm.h macgui.h font.h \ - $(config_h) + systime.h xterm.h w32term.h w32gui.h font.h \ + nsterm.h nsgui.h $(config_h) indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \ termopts.h disptab.h region-cache.h character.h category.h composite.h \ dispextern.h keyboard.h -insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h character.h \ +insdel.o: insdel.c window.h buffer.h $(INTERVALS_H) blockinput.h character.h \ dispextern.h atimer.h systime.h region-cache.h $(config_h) keyboard.o: keyboard.c termchar.h termhooks.h termopts.h buffer.h character.h \ commands.h frame.h window.h macros.h disptab.h keyboard.h syssignal.h \ - systime.h dispextern.h syntax.h $(INTERVAL_SRC) blockinput.h \ - atimer.h xterm.h puresize.h msdos.h keymap.h w32term.h macterm.h $(config_h) + systime.h dispextern.h syntax.h $(INTERVALS_H) blockinput.h atimer.h \ + xterm.h puresize.h msdos.h keymap.h w32term.h nsterm.h \ + $(config_h) keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \ - atimer.h systime.h puresize.h character.h intervals.h keymap.h window.h \ + atimer.h systime.h puresize.h character.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 \ @@ -1104,12 +1116,25 @@ vm-limit.o: vm-limit.c mem-limits.h $(config_h) marker.o: marker.c buffer.h character.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 character.h msdos.h $(INTERVAL_SRC) keymap.h \ + buffer.h commands.h character.h msdos.h $(INTERVALS_H) keymap.h \ termhooks.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 character.h coding.h ccl.h disptab.h window.h \ - keyboard.h intervals.h buffer.h commands.h blockinput.h atimer.h $(config_h) + keyboard.h $(INTERVALS_H) buffer.h commands.h blockinput.h atimer.h $(config_h) +nsfns.o: nsfns.m charset.h nsterm.h nsgui.h frame.h window.h buffer.h \ + dispextern.h nsgui.h fontset.h $(INTERVALS_H) keyboard.h blockinput.h \ + atimer.h systime.h epaths.h termhooks.h coding.h systime.h $(config_h) +nsfont.o: nsterm.h dispextern.h frame.h lisp.h $(config_h) +nsimage.o: nsimage.m nsterm.h $(config_h) +nsmenu.o: nsmenu.m termhooks.h frame.h window.h dispextern.h \ + nsgui.h keyboard.h blockinput.h atimer.h systime.h buffer.h \ + nsterm.h $(config_h) +nsterm.o: nsterm.m blockinput.h atimer.h systime.h syssignal.h nsterm.h \ + nsgui.h frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h \ + termopts.h termchar.h disptab.h buffer.h window.h keyboard.h \ + $(INTERVALS_H) process.h coding.h $(config_h) +nsselect.o: nsselect.m blockinput.h nsterm.h nsgui.h frame.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 \ @@ -1121,44 +1146,53 @@ scroll.o: scroll.c termchar.h dispextern.h frame.h msdos.h keyboard.h \ termhooks.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 character.h charset.h \ - composite.h $(INTERVAL_SRC) \ + composite.h $(INTERVALS_H) \ $(config_h) +sound.o: sound.c dispextern.h syssignal.h $(config_h) strftime.o: strftime.c $(config_h) syntax.o: syntax.c syntax.h buffer.h commands.h category.h character.h \ - composite.h keymap.h regex.h $(INTERVAL_SRC) $(config_h) + composite.h keymap.h regex.h $(INTERVALS_H) $(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 cm.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 character.h charset.h coding.h ccl.h \ - msdos.h window.h keymap.h blockinput.h atimer.h systime.h + msdos.h window.h keymap.h blockinput.h atimer.h systime.h systty.h \ + syssignal.h $(INTERVALS_H) termcap.o: termcap.c $(config_h) terminal.o: terminal.c frame.h termchar.h termhooks.h charset.h coding.h \ keyboard.h $(config_h) terminfo.o: terminfo.c $(config_h) tparam.o: tparam.c $(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) +unexaix.o: unexaix.c $(config_h) +unexalpha.o: unexalpha.c $(config_h) +unexcw.o: unexcw.c $(config_h) +unexec.o: unexec.c $(config_h) +unexelf.o: unexelf.c $(config_h) +unexhp9k800.o: unexhp9k800.c $(config_h) +unexmacosx.o: unexmacosx.c $(config_h) +unexmips.o: unexmips.c $(config_h) +unexnext.o: unexnext.c $(config_h) +unexsol.o: unexsol.c $(config_h) +unexw32.o: unexw32.c $(config_h) w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.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 \ disptab.h keyboard.h dispextern.h msdos.h composite.h \ - keymap.h blockinput.h atimer.h systime.h $(INTERVAL_SRC) \ - xterm.h w32term.h macterm.h $(config_h) + keymap.h blockinput.h atimer.h systime.h $(INTERVALS_H) \ + xterm.h w32term.h nsterm.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 character.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 font.h + charset.h $(config_h) keyboard.h $(INTERVALS_H) region-cache.h xterm.h \ + w32term.h nsterm.h msdos.h composite.h fontset.h \ + blockinput.h atimer.h systime.h keymap.h font.h xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \ window.h character.h charset.h msdos.h dosfns.h composite.h atimer.h \ - systime.h keyboard.h fontset.h w32term.h macterm.h $(INTERVAL_SRC) \ - termchar.h termhooks.h font.h $(config_h) + systime.h keyboard.h fontset.h w32term.h nsterm.h \ + $(INTERVALS_H) termchar.h termhooks.h font.h $(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 \ character.h charset.h coding.h gtkutil.h $(config_h) termhooks.h \ @@ -1170,125 +1204,102 @@ xftfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \ ftxfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \ font.h $(config_h) menu.o: menu.c lisp.h keyboard.h keymap.h frame.h termhooks.h blockinput.h \ - dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h $(config_h) + dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h menu.h \ + $(config_h) xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \ - systime.h gtkutil.h msdos.h coding.h $(config_h) + systime.h gtkutil.h msdos.h coding.h menu.h $(config_h) xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \ dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \ keyboard.h emacs-icon.h character.h charset.h ccl.h fontset.h composite.h \ - coding.h process.h gtkutil.h font.h $(config_h) + coding.h process.h gtkutil.h font.h fontset.h $(config_h) xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \ buffer.h atimer.h systime.h termhooks.h $(config_h) 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 systime.h termhooks.h keyboard.h \ - charset.h coding.h -dbusbind.o: dbusbind.c termhooks.h $(config_h) - -hftctl.o: hftctl.c $(config_h) -sound.o: sound.c dispextern.h $(config_h) -atimer.o: atimer.c atimer.h systime.h $(config_h) /* The files of Lisp proper */ alloc.o: alloc.c process.h frame.h window.h buffer.h puresize.h syssignal.h keyboard.h \ blockinput.h atimer.h systime.h character.h dispextern.h $(config_h) \ - $(INTERVAL_SRC) + $(INTERVALS_H) bytecode.o: bytecode.c buffer.h syntax.h character.h window.h dispextern.h \ frame.h xterm.h $(config_h) data.o: data.c buffer.h puresize.h character.h syssignal.h keyboard.h frame.h \ termhooks.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) +floatfns.o: floatfns.c syssignal.h $(config_h) fns.o: fns.c commands.h $(config_h) frame.h buffer.h character.h keyboard.h \ - keymap.h frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h \ + keymap.h frame.h window.h dispextern.h $(INTERVALS_H) coding.h md5.h \ blockinput.h atimer.h systime.h xterm.h termhooks.h print.o: print.c process.h frame.h window.h buffer.h keyboard.h character.h \ - $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h \ - blockinput.h atimer.h systime.h font.h + $(config_h) dispextern.h termchar.h $(INTERVALS_H) msdos.h composite.h \ + blockinput.h atimer.h systime.h font.h charset.h lread.o: lread.c commands.h keyboard.h buffer.h epaths.h character.h \ - charset.h $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h + charset.h $(config_h) $(INTERVALS_H) termhooks.h coding.h msdos.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 \ +composite.o: composite.c buffer.h character.h coding.h dispextern.h font.h \ + frame.h termhooks.h $(INTERVALS_H) window.h $(config_h) +intervals.o: intervals.c buffer.h $(INTERVALS_H) keyboard.h puresize.h \ keymap.h $(config_h) -composite.o: composite.c buffer.h character.h $(INTERVAL_SRC) $(config_h) +textprop.o: textprop.c buffer.h window.h dispextern.h $(INTERVALS_H) \ + $(config_h) /* System-specific programs to be made. OTHER_FILES and OBJECTS_MACHINE select which of these should be compiled. */ -#ifdef HAVE_CARBON -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 terminal.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 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 $(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 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) -mactoolbox.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \ - charset.h coding.h ccl.h dispextern.h fontset.h termhooks.h buffer.h \ - window.h keyboard.h $(config_h) - -${emacsapp}Contents/Resources/English.lproj: - mkdir -p $@ - -ifneq (${emacsapp},${emacsappsrc}) -${emacsapp}Contents/Info.plist: ${emacsappsrc}Contents/Info.plist - cp $< $@ -${emacsapp}Contents/PkgInfo: ${emacsappsrc}Contents/PkgInfo - cp $< $@ -${emacsapp}Contents/Resources/Emacs.icns: ${emacsappsrc}Contents/Resources/Emacs.icns - mkdir -p ${emacsapp}Contents/Resources - cp $< $@ -${emacsapp}Contents/Resources/English.lproj/InfoPlist.strings: ${emacsappsrc}Contents/Resources/English.lproj/InfoPlist.strings - cp $< $@ -endif - -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/MacOS/Emacs: emacs${EXEEXT} - mkdir -p ${emacsapp}Contents/MacOS/; - cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs${EXEEXT} Emacs${EXEEXT} -#endif +#ifdef HAVE_NS +/* In fact, every .o file depends directly or indirectly on dispextern.h + and hence nsgui.h under NS. But the ones that actually use stuff there + are more limited. */ +dispnew.o font.o fontset.o frame.o fringe.o image.o keyboard.o menu.o \ + window.o xdisp.o xfaces.o: nsgui.h + +${ns_appdir}: ${ns_appsrc} + rm -fr ${ns_appdir} + mkdir -p ${ns_appdir} + ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; tar xf - ) + ( cd ${ns_appdir} ; for subdir in `find . -type d ! -name CVS -print` ; do \ + chmod a+rx $${subdir} ; \ + rm -rf $${subdir}/CVS ; \ + rm -f $${subdir}/.cvsignore ; done ; ) + +${ns_appbindir}Emacs: emacs${EXEEXT} + mkdir -p ${ns_appbindir} + cp -f emacs${EXEEXT} ${ns_appbindir}Emacs + +ns-app: ${ns_appdir} ${ns_appbindir}Emacs + +#endif /* HAVE_NS */ mostlyclean: rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a rm -f ../etc/DOC - rm -f bootstrap-emacs${EXEEXT} emacs-${version}${EXEEXT} witness-emacs + 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. -/**/# Do not use it on development directories! -distclean: clean - rm -f epaths.h config.h Makefile Makefile.c config.stamp stamp-oldxmenu ../etc/DOC-* - mv ./.gdbinit ./.gdbinit.save - if test -f "${srcdir}/.gdbinit"; then rm -f ./.gdbinit.save; \ - else mv ./.gdbinit.save ./.gdbinit; fi +#ifdef HAVE_NS + rm -fr ${ns_appdir} +#endif /* bootstrap-clean is used to clean up just before a bootstrap. It should remove all files generated during a compilation/bootstrap, but not things like config.status or TAGS. */ -bootstrap-clean: distclean +bootstrap-clean: clean + rm -f epaths.h config.h Makefile.c config.stamp stamp-oldxmenu ../etc/DOC-* + if test -f ./.gdbinit; then \ + mv ./.gdbinit ./.gdbinit.save; \ + if test -f "${srcdir}/.gdbinit"; then rm -f ./.gdbinit.save; \ + else mv ./.gdbinit.save ./.gdbinit; fi; \ + fi +/**/# This is used in making a distribution. +/**/# Do not use it on development directories! +distclean: bootstrap-clean + rm -f Makefile maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." @@ -1328,40 +1339,45 @@ tags: TAGS TAGS-LISP $(lwlibdir)TAGS To solve the circularity, we use 2 different Emacs executables, "emacs" is the main target and "bootstrap-emacs" is the one used to build the *.elc and loaddefs.el files. - To solve the freshness issue, we use a third file "witness-emacs" - which is used to witness the fact that there is a bootstrap-emacs - executable. */ + To solve the freshness issue, we used to use a third file "witness-emacs" + which was used to witness the fact that there is a bootstrap-emacs + executable, and then have dependencies on witness-emacs rather than + bootstrap-emacs, but that lead to problems in parallel builds (because + witness-emacs needed to be free from dependencies (to avoid rebuilding + it), so it was compiled in parallel, leading typically to having 2 + processes dumping bootstrap-emacs at the same time). + So instead, we replace the witness-emacs dependencies by conditional + bootstrap-dependencies (via ${BOOTSTRAPEMACS}). Of course, since we do + not want to rely on GNU Make features, we have to rely on an external + script to do the conditional part of the dependency + (i.e. see the ${SUBDIR} rule ../Makefile.in). */ + +.SUFFIXES: .elc .el /* These suffix rules do not allow additional dependencies, sadly, so - adding a bootstrap-emacs%{EXEEXT} dependency does not work --Stef */ + instead of adding a $(BOOTSTRAPEMACS) dependency here, we add it + separately below. + With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)" */ .el.elc: @cd ../lisp; $(MAKE) $(MFLAGS) compile-onefile \ - THEFILE=$< EMACS=../src/bootstrap-emacs${EXEEXT} + THEFILE=$< EMACS=../src/bootstrap-emacs${EXEEXT} -/* Since the .el.elc rule cannot specify an extra dependency, we do it here. - The byte-compiler dependency is not necessary, but it substantially - speeds up byte-compilation of the other files. - Of course, it also has the downside of forcing a recompilation of all - those files whenever a file in $PRECOMP changes. */ -${lisp} ${SOME_MACHINE_LISP}: witness-emacs +/* Since the .el.elc rule cannot specify an extra dependency, we do it here. */ +${lisp} ${SOME_MACHINE_LISP}: $(BOOTSTRAPEMACS) -../lisp/loaddefs.el: witness-emacs +${lispsource}loaddefs.el: $(BOOTSTRAPEMACS) cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=../src/bootstrap-emacs${EXEEXT} /* Dump an Emacs executable named bootstrap-emacs containing the files from loadup.el in source form. */ bootstrap-emacs${EXEEXT}: temacs${EXEEXT} + cd ../lisp; $(MAKE) $(MFLAGS) update-subdirs #ifdef CANNOT_DUMP - ln temacs${EXEEXT} bootstrap-emacs${EXEEXT} + ln -f temacs${EXEEXT} bootstrap-emacs${EXEEXT} #else $(RUN_TEMACS) --batch --load loadup bootstrap mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT} #endif /* ! defined (CANNOT_DUMP) */ - -witness-emacs: temacs${EXEEXT} - cd ../lisp; $(MAKE) $(MFLAGS) update-subdirs - $(MAKE) $(MFLAGS) bootstrap-emacs${EXEEXT} - touch witness-emacs @: Compile some files earlier to speed up further compilation. cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=../src/bootstrap-emacs${EXEEXT}