Mercurial > emacs
diff src/Makefile.in @ 30288:8766468f819e
Add dependencies on dispextern.h.
(alloca.o): Don't define malloc and define EMACS_FREE instead of
`free'; both can conflict with system header files.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Tue, 18 Jul 2000 13:02:29 +0000 |
parents | 91a927c58efc |
children | 6fd1ba16482c |
line wrap: on
line diff
--- a/src/Makefile.in Tue Jul 18 12:59:17 2000 +0000 +++ b/src/Makefile.in Tue Jul 18 13:02:29 2000 +0000 @@ -953,7 +953,7 @@ whenever emacs was #defined, but that's not appropriate for all users of alloca in Emacs. Check out ../lib-src/getopt.c. */ alloca.o : alloca.c - $(CC) -c $(CPPFLAGS) -Dfree=xfree -Dmalloc=xmalloc \ + $(CC) -c $(CPPFLAGS) -DEMACS_FREE=xfree \ $(ALL_CFLAGS) ${srcdir}/alloca.c #else #ifndef HAVE_ALLOCA @@ -982,11 +982,12 @@ it is so often changed in ways that do not require any recompilation and so rarely changed in ways that do require any. */ -abbrev.o: abbrev.c buffer.h window.h commands.h charset.h $(config_h) +abbrev.o: abbrev.c buffer.h window.h dispextern.h commands.h charset.h \ + $(config_h) buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \ - $(INTERVAL_SRC) blockinput.h charset.h $(config_h) + dispextern.h $(INTERVAL_SRC) blockinput.h charset.h $(config_h) callint.o: callint.c window.h commands.h buffer.h mocklisp.h \ - keyboard.h $(config_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 @@ -998,7 +999,7 @@ coding.o: coding.c coding.h ccl.h buffer.h charset.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 + msdos.h dispextern.h pre-crt0.o: pre-crt0.c ecrt0.o: ecrt0.c $(config_h) CRT0_COMPILE ${srcdir}/ecrt0.c @@ -1011,21 +1012,21 @@ doprnt.o: doprnt.c charset.h $(config_h) dosfns.o: buffer.h termchar.h termhooks.h frame.h msdos.h dosfns.h $(config_h) editfns.o: editfns.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \ - coding.h $(config_h) + coding.h dispextern.h $(config_h) emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \ termhooks.h buffer.h $(INTERVAL_SRC) $(config_h) fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \ - coding.h ccl.h msdos.h $(config_h) + coding.h ccl.h msdos.h dispextern.h $(config_h) filelock.o: filelock.c buffer.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 \ - buffer.h charset.h fontset.h msdos.h dosfns.h $(config_h) + buffer.h charset.h fontset.h msdos.h dosfns.h dispextern.h $(config_h) fontset.o: dispextern.h fontset.h fontset.c ccl.h charset.h frame.h $(config_h) getloadavg.o: getloadavg.c $(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 charset.h composite.h + termopts.h disptab.h region-cache.h charset.h composite.h dispextern.h insdel.o: insdel.c window.h buffer.h $(INTERVAL_SRC) blockinput.h charset.h\ - $(config_h) + dispextern.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 \ @@ -1033,7 +1034,8 @@ keymap.o: keymap.c buffer.h commands.h keyboard.h termhooks.h blockinput.h \ puresize.h charset.h intervals.h $(config_h) lastfile.o: lastfile.c $(config_h) -macros.o: macros.c window.h buffer.h commands.h macros.h keyboard.h $(config_h) +macros.o: macros.c window.h buffer.h commands.h macros.h keyboard.h \ + dispextern.h $(config_h) malloc.o: malloc.c $(config_h) gmalloc.o: gmalloc.c $(config_h) ralloc.o: ralloc.c $(config_h) @@ -1046,7 +1048,7 @@ 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 $(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 \ + commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \ blockinput.h charset.h coding.h ccl.h msdos.h composite.h $(config_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 @@ -1081,7 +1083,7 @@ msdos.h composite.h fontset.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 $(config_h) -xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h\ +xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.h dispextern.h \ $(srcdir)/../lwlib/lwlib.h blockinput.h epaths.h charset.h $(config_h) xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h keyboard.h \ $(srcdir)/../lwlib/lwlib.h blockinput.h msdos.h $(config_h) @@ -1099,20 +1101,21 @@ /* The files of Lisp proper */ alloc.o: alloc.c frame.h window.h buffer.h puresize.h syssignal.h keyboard.h \ - blockinput.h charset.h $(config_h) $(INTERVAL_SRC) + blockinput.h charset.h dispextern.h $(config_h) $(INTERVAL_SRC) bytecode.o: bytecode.c buffer.h syntax.h charset.h $(config_h) data.o: data.c buffer.h puresize.h charset.h syssignal.h keyboard.h $(config_h) eval.o: eval.c commands.h keyboard.h blockinput.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 $(INTERVAL_SRC) + frame.h window.h dispextern.h $(INTERVAL_SRC) 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 msdos.h /* Text properties support */ -textprop.o: textprop.c buffer.h window.h $(INTERVAL_SRC) $(config_h) +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) composite.o: composite.c buffer.h charset.h $(INTERVAL_SRC) $(config_h) @@ -1123,7 +1126,7 @@ OTHER_FILES and OBJECTS_MACHINE select which of these should be compiled. */ -sunfns.o: sunfns.c buffer.h window.h $(config_h) +sunfns.o: sunfns.c buffer.h window.h dispextern.h $(config_h) ${libsrc}emacstool: ${libsrc}emacstool.c cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool