X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7e6601408a43babc044898a2fde27d4b16d717ea..9899d01a0ccec166e04caa60657a44e614be50cd:/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in index 8dd211c0fa..28c2c970a6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -6,7 +6,7 @@ # 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, @@ -403,8 +403,7 @@ LIBXT=$(LIBW) #endif /* not USE_X_TOOLKIT */ #if HAVE_XFT -#undef LIB_X11_LIB -#define LIB_X11_LIB @XFT_LIBS@ +XFT_LIBS=@XFT_LIBS@ #endif /* HAVE_XFT */ #if HAVE_XPM @@ -441,7 +440,7 @@ LIBXT=$(LIBW) #if HAVE_GIF #ifndef LIBGIF -#define LIBGIF -lungif +#define LIBGIF -lgif #endif /* not defined LIBGIF */ #else /* not HAVE_GIF */ #define LIBGIF @@ -451,13 +450,22 @@ 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 */ #endif /* not HAVE_X_WINDOWS */ +#if HAVE_GPM +#ifndef LIBGPM +#define LIBGPM -lgpm +#endif /* not defined LIBGPM */ +#else /* not HAVE_GPM */ +#define LIBGPM +#endif /* not HAVE_GPM */ + + LIBSOUND= @LIBSOUND@ CFLAGS_SOUND= @CFLAGS_SOUND@ @@ -584,7 +592,7 @@ emacsappsrc = ${srcdir}/../mac/Emacs.app/ whose initialized data areas should be dumped as pure by dump-emacs. */ 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) $(GTK_OBJ)\ + cm.o term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ)\ emacs.o keyboard.o macros.o keymap.o sysdep.o \ buffer.o filelock.o insdel.o marker.o \ minibuf.o fileio.o dired.o filemode.o \ @@ -665,8 +673,12 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO #define MOUSE_SUPPORT ${lispsource}mouse.elc \ ${lispsource}select.elc ${lispsource}scroll-bar.elc #else +#ifdef HAVE_GPM +#define MOUSE_SUPPORT ${lispsource}mouse.elc +#else #define MOUSE_SUPPORT #endif +#endif #ifdef VMS #define VMS_SUPPORT ${lispsource}vmsproc.elc ${lispsource}vms-patch.elc @@ -726,6 +738,7 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO lisp= \ ${lispsource}abbrev.elc \ ${lispsource}buff-menu.elc \ + ${lispsource}server.elc \ ${lispsource}button.elc \ ${lispsource}emacs-lisp/byte-run.elc \ ${lispsource}cus-face.elc \ @@ -742,6 +755,7 @@ lisp= \ MOUSE_SUPPORT \ ${lispsource}emacs-lisp/float-sup.elc \ ${lispsource}frame.elc \ + ${lispsource}termdev.elc \ ${lispsource}help.elc \ ${lispsource}indent.elc \ ${lispsource}isearch.elc \ @@ -825,6 +839,7 @@ lisp= \ shortlisp= \ ../lisp/abbrev.elc \ ../lisp/buff-menu.elc \ + ../lisp/server.elc \ ../lisp/button.elc \ ../lisp/emacs-lisp/byte-run.elc \ ../lisp/cus-face.elc \ @@ -839,6 +854,7 @@ shortlisp= \ ../lisp/emacs-lisp/float-sup.elc \ ../lisp/format.elc \ ../lisp/frame.elc \ + ../lisp/termdev.elc \ ../lisp/help.elc \ ../lisp/indent.elc \ ../lisp/isearch.elc \ @@ -928,13 +944,15 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \ ${dotdot}/lisp/x-dnd.elc \ ${dotdot}/lisp/international/ccl.elc \ ${dotdot}/lisp/international/codepage.elc \ - ${dotdot}/lisp/international/fontset.elc + ${dotdot}/lisp/international/fontset.elc \ + ${dotdot}/lisp/mouse.elc \ + ${dotdot}/lisp/term/x-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) \ +LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) LIBGPM \ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ LIBS_DEBUG $(GETLOADAVG_LIBS) $(GNULIB_VAR) LIB_MATH LIB_STANDARD \ $(GNULIB_VAR) @@ -974,7 +992,7 @@ emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${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} +${etc}DOC: ${libsrc}make-docfile ${obj} ${shortlisp} ${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} @@ -1081,7 +1099,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 @@ -1097,7 +1115,7 @@ 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 w32.h blockinput.h atimer.h systime.h + composite.h w32.h blockinput.h atimer.h systime.h frame.h termhooks.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) @@ -1106,16 +1124,16 @@ 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 dispextern.h $(config_h) -cm.o: cm.c cm.h termhooks.h $(config_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 charset.h commands.h window.h $(config_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 blockinput.h -dispnew.o: dispnew.c systty.h systime.h commands.h process.h frame.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 \ xterm.h blockinput.h atimer.h charset.h msdos.h composite.h keyboard.h \ @@ -1123,22 +1141,23 @@ dispnew.o: dispnew.c systty.h systime.h commands.h process.h frame.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 blockinput.h window.h \ - msdos.h dosfns.h dispextern.h charset.h coding.h $(config_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 frame.h blockinput.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 dispextern.h keyboard.h keymap.h fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \ - coding.h msdos.h dispextern.h blockinput.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 w32term.h macterm.h $(config_h) -fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h) + msdos.h dosfns.h dispextern.h w32term.h macterm.h termchar.h $(config_h) +fringe.o: fringe.c dispextern.h frame.h window.h buffer.h termhooks.h $(config_h) fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \ - keyboard.h $(config_h) + keyboard.h termhooks.h $(config_h) getloadavg.o: getloadavg.c $(config_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 $(config_h) @@ -1149,7 +1168,7 @@ insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.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 \ + 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) keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \ atimer.h systime.h puresize.h charset.h intervals.h keymap.h window.h \ @@ -1164,11 +1183,12 @@ 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 $(INTERVAL_SRC) keymap.h $(config_h) + buffer.h commands.h charset.h msdos.h $(INTERVAL_SRC) 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 charset.h coding.h ccl.h disptab.h window.h \ - keyboard.h intervals.h buffer.h commands.h blockinput.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 \ @@ -1176,7 +1196,7 @@ process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \ regex.o: regex.c syntax.h buffer.h $(config_h) regex.h category.h charset.h 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) + 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 charset.h composite.h \ $(INTERVAL_SRC) $(config_h) @@ -1185,11 +1205,13 @@ syntax.o: syntax.c syntax.h buffer.h commands.h category.h charset.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) + 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 charset.h coding.h ccl.h msdos.h \ - window.h keymap.h + window.h keymap.h blockinput.h atimer.h systime.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) @@ -1202,18 +1224,20 @@ w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.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 \ - keymap.h blockinput.h $(INTERVAL_SRC) xterm.h w32term.h macterm.h $(config_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) 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 \ - keyboard.h fontset.h w32term.h macterm.h $(INTERVAL_SRC) $(config_h) + keyboard.h fontset.h w32term.h macterm.h $(INTERVAL_SRC) termchar.h \ + termhooks.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 \ - charset.h gtkutil.h $(config_h) + charset.h gtkutil.h termchar.h termhooks.h $(config_h) xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h systime.h \ gtkutil.h msdos.h coding.h $(config_h) @@ -1222,12 +1246,13 @@ xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \ keyboard.h gnu.h charset.h ccl.h fontset.h composite.h \ coding.h process.h gtkutil.h $(config_h) xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \ - buffer.h atimer.h systime.h $(config_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 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) @@ -1239,15 +1264,16 @@ alloc.o: alloc.c process.h frame.h window.h buffer.h puresize.h syssignal.h key 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 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) +data.o: data.c buffer.h puresize.h charset.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) fns.o: fns.c commands.h $(config_h) frame.h buffer.h charset.h keyboard.h \ keymap.h frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h \ - blockinput.h xterm.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 charset.h \ - $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.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 @@ -1262,25 +1288,26 @@ composite.o: composite.c buffer.h charset.h $(INTERVAL_SRC) $(config_h) OTHER_FILES and OBJECTS_MACHINE select which of these should be compiled. */ -sunfns.o: sunfns.c buffer.h window.h dispextern.h $(config_h) +sunfns.o: sunfns.c buffer.h window.h dispextern.h termhooks.h $(config_h) #ifdef HAVE_CARBON 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 \ + 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 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 macterm.h macgui.h frame.h keymap.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 $@ @@ -1301,15 +1328,10 @@ 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