(adjust_markers_for_delete): Make it non-static.

[bpt/emacs.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 69ae778..05d2ddc 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for GNU Emacs.
-# Copyright (C) 1985, 87, 88, 93, 94, 95 Free Software Foundation, Inc.
+# Copyright (C) 1985, 87, 88, 93, 94, 95, 1999 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -402,7 +402,7 @@ LIBXT=
 
 #if HAVE_TIFF
 #ifndef LIBTIFF
-#define LIBTIFF -ltiff34
+#define LIBTIFF -ltiff
 #endif /* not defined LIBTIFF */
 #else /* not HAVE_TIFF */
 #define LIBTIFF
@@ -520,13 +520,8 @@ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE \
 #define UNEXEC_SRC unexec.c
 #endif
 
-#ifdef USE_TEXT_PROPERTIES
 #define INTERVAL_SRC intervals.h
 #define INTERVAL_OBJ intervals.o textprop.o
-#else
-#define INTERVAL_SRC
-#define INTERVAL_OBJ
-#endif
 
 #ifdef HAVE_GETLOADAVG
 #define GETLOADAVG_OBJ
@@ -856,9 +851,9 @@ emacs: temacs ${etc}DOC ${lisp}
        ln temacs emacs
 #else
 #ifdef HAVE_SHM
-       ./temacs -nl -batch -l loadup dump
+       LC_ALL=C ./temacs -nl -batch -l loadup dump
 #else /* ! defined (HAVE_SHM) */
-       ./temacs -batch -l loadup dump
+       LC_ALL=C ./temacs -batch -l loadup dump
 #endif /* ! defined (HAVE_SHM) */
 #endif /* ! defined (CANNOT_DUMP) */
        -./emacs -q -batch -f list-load-path-shadows
@@ -1057,7 +1052,8 @@ cmds.o: cmds.c syntax.h buffer.h charset.h commands.h window.h $(config_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
+dired.o: dired.c commands.h buffer.h $(config_h) charset.h coding.h regex.h \
+   systime.h
 dispnew.o: dispnew.c  commands.h frame.h window.h buffer.h dispextern.h \
    termchar.h termopts.h termhooks.h cm.h disptab.h systty.h systime.h \
    xterm.h blockinput.h charset.h msdos.h $(config_h)
@@ -1065,7 +1061,7 @@ doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.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)
 editfns.o: editfns.c window.h buffer.h systime.h INTERVAL_SRC charset.h \
-   $(config_h)
+   coding.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 \
@@ -1073,7 +1069,7 @@ fileio.o: fileio.c window.h buffer.h systime.h INTERVAL_SRC charset.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 $(config_h)
+   buffer.h charset.h fontset.h msdos.h dosfns.h $(config_h)
 fontset.o: 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 \
@@ -1112,7 +1108,7 @@ syntax.o: syntax.c syntax.h buffer.h commands.h category.h charset.h \
    $(config_h)
 sysdep.o: sysdep.c $(config_h) dispextern.h termhooks.h termchar.h termopts.h \
    frame.h syssignal.h systty.h systime.h syswait.h blockinput.h window.h \
-   msdos.h
+   msdos.h dosfns.h
 term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \
    disptab.h keyboard.h charset.h coding.h ccl.h msdos.h
 termcap.o: termcap.c $(config_h)
@@ -1123,7 +1119,7 @@ undo.o: undo.c buffer.h commands.h $(config_h)
    of UNEXEC when substituting it in.  */
 UNEXEC_ALIAS=UNEXEC
 $(UNEXEC_ALIAS): UNEXEC_SRC $(config_h)
-w16select.o: w16select.c lisp.h dispextern.h frame.h blockinput.h \
+w16select.o: w16select.c dispextern.h frame.h blockinput.h \
    msdos.h $(config_h)
 widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \
    $(srcdir)/../lwlib/lwlib.h $(config_h)
@@ -1133,7 +1129,7 @@ xdisp.o: xdisp.c macros.h commands.h indent.h buffer.h dispextern.h coding.h \
    termchar.h frame.h window.h disptab.h termhooks.h charset.h $(config_h) \
    msdos.h
 xfaces.o: xfaces.c dispextern.h frame.h xterm.h buffer.h blockinput.h \
-   window.h charset.h msdos.h $(config_h)
+   window.h charset.h msdos.h dosfns.h $(config_h)
 xfns.o: xfns.c buffer.h frame.h window.h keyboard.h xterm.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 \
@@ -1145,7 +1141,7 @@ xselect.o: xselect.c dispextern.h frame.h xterm.h blockinput.h charset.h \
   coding.h ccl.h buffer.h $(config_h)
 xrdb.o: xrdb.c $(config_h) epaths.h
 hftctl.o: hftctl.c $(config_h)
-sound.o: sound.c dispextern.h lisp.h $(config_h)
+sound.o: sound.c dispextern.h $(config_h)
 
 /* The files of Lisp proper */
 
@@ -1217,3 +1213,31 @@ TAGS-LISP: frc
            lispsource=${lispsource}
 tags: TAGS TAGS-LISP
 .PHONY: tags
+
+
+/* Bootstrapping.  */
+
+bootstrap: bootstrap-emacs
+
+/* Build a temacs with a sufficiently large PURESIZE to load the
+   Lisp files from loadup.el in source form.  */
+
+bootstrap-temacs: 
+       $(MAKE) $(MFLAGS) temacs ALL_CFLAGS="$(ALL_CFLAGS) -DPURESIZE=5000000"
+
+/* Dump an Emacs executable named bootstrap-emacs containing the 
+   files from loadup.el in source form.  */
+
+bootstrap-emacs: bootstrap-temacs
+#ifdef CANNOT_DUMP
+       ln temacs bootstrap-emacs
+#else
+#ifdef HAVE_SHM
+       ./temacs -nl -batch -l loadup bootstrap
+#else /* ! defined (HAVE_SHM) */
+       ./temacs --batch --load loadup bootstrap
+#endif /* ! defined (HAVE_SHM) */
+#endif /* ! defined (CANNOT_DUMP) */
+       mv emacs bootstrap-emacs
+       rm -f temacs
+