(waiting_for_input): Remove unnecessary prototype.

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

diff --git a/src/Makefile.in b/src/Makefile.in
index 5bbfe5f..b20ec7d 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,6 @@
 # Makefile for GNU Emacs.
-# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1985, 87, 88, 93, 94, 95, 99, 2000, 2001
+# Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -23,7 +24,7 @@
 # script may need modifying in sync with changes made here.  Try to
 # avoid shell-ism because the DOS build has to use the DOS shell.
 
-# Don't try to replace the ccp processing using autoconf facilities,
+# Don't try to replace the cpp processing using autoconf facilities,
 # says rms.
 
 # Here are the things that we expect ../configure to edit.
@@ -411,7 +412,7 @@ LIBXT=
 /* 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) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM LIBXPM LIBTIFF LIBJPEG LIBPNG LIBGIF
+LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
 #else /* not HAVE_X11 */
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
 #endif /* not HAVE_X11 */
@@ -540,7 +541,7 @@ obj=    dispnew.o frame.o scroll.o xdisp.o xmenu.o window.o \
        abbrev.o syntax.o UNEXEC mocklisp.o bytecode.o \
        process.o callproc.o \
        region-cache.o sound.o atimer.o \
-       doprnt.o strftime.o intervals.o textprop.o composite.o \
+       doprnt.o strftime.o intervals.o textprop.o composite.o md5.o \
        $(MSDOS_OBJ)
 
 /* Object files used on some machine or other.
@@ -647,6 +648,7 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO
 lisp= \
        ${lispsource}abbrev.elc \
        ${lispsource}buff-menu.elc \
+       ${lispsource}button.elc \
        ${lispsource}byte-run.elc \
        ${lispsource}cus-start.el \
        ${lispsource}custom.elc \
@@ -665,13 +667,21 @@ lisp= \
        ${lispsource}isearch.elc \
        ${lispsource}loadup.el \
        ${lispsource}loaddefs.el \
-       ${lispsource}bindings.el \
+       ${lispsource}bindings.elc \
        ${lispsource}map-ynp.elc \
        ${lispsource}menu-bar.elc \
        ${lispsource}international/mule.elc \
        ${lispsource}international/mule-conf.el \
        ${lispsource}international/mule-cmds.elc \
        ${lispsource}international/characters.elc \
+       ${lispsource}international/utf-8.elc \
+       ${lispsource}international/latin-1.el \
+       ${lispsource}international/latin-2.el \
+       ${lispsource}international/latin-3.el \
+       ${lispsource}international/latin-4.el \
+       ${lispsource}international/latin-5.el \
+       ${lispsource}international/latin-8.el \
+       ${lispsource}international/latin-9.el \
        ${lispsource}case-table.elc \
        ${lispsource}language/chinese.elc \
        ${lispsource}language/cyrillic.elc \
@@ -719,9 +729,11 @@ lisp= \
 shortlisp= \
        ../lisp/abbrev.elc \
        ../lisp/buff-menu.elc \
+       ../lisp/button.elc \
        ../lisp/byte-run.elc \
        ../lisp/cus-start.el \
        ../lisp/custom.elc \
+       ../lisp/emacs-lisp/backquote.elc \
        ../lisp/emacs-lisp/lisp-mode.elc \
        ../lisp/emacs-lisp/lisp.elc \
        ../lisp/facemenu.elc \
@@ -735,12 +747,21 @@ shortlisp= \
        ../lisp/isearch.elc \
        ../lisp/loadup.el \
        ../lisp/loaddefs.el \
-       ../lisp/bindings.el \
+       ../lisp/bindings.elc \
        ../lisp/map-ynp.elc \
+       ../lisp/env.elc \
        ../lisp/international/mule.elc \
        ../lisp/international/mule-conf.el \
        ../lisp/international/mule-cmds.elc \
        ../lisp/international/characters.elc \
+       ../lisp/international/utf-8.elc \
+       ../lisp/international/latin-1.el \
+       ../lisp/international/latin-2.el \
+       ../lisp/international/latin-3.el \
+       ../lisp/international/latin-4.el \
+       ../lisp/international/latin-5.el \
+       ../lisp/international/latin-8.el \
+       ../lisp/international/latin-9.el \
        ../lisp/case-table.elc \
        ../lisp/language/chinese.elc \
        ../lisp/language/cyrillic.elc \
@@ -761,6 +782,7 @@ shortlisp= \
        ../lisp/language/tibetan.elc \
        ../lisp/language/vietnamese.elc \
        ../lisp/language/misc-lang.elc \
+       ../lisp/menu-bar.elc \
        ../lisp/paths.el \
        ../lisp/register.elc \
        ../lisp/replace.elc \
@@ -783,7 +805,7 @@ shortlisp= \
    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.  */
-SOME_MACHINE_LISP = ${dotdot}/lisp/menu-bar.elc ${dotdot}/lisp/mouse.elc \
+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 \
@@ -834,7 +856,7 @@ emacs: temacs ${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 ${obj} ${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}
@@ -1099,7 +1121,7 @@ xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h keyboard.h \
    $(config_h)
 xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h \
   dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \
-  keyboard.h gnu.h sink.h sinkmask.h charset.h ccl.h fontset.h composite.h \
+  keyboard.h gnu.h charset.h ccl.h fontset.h composite.h \
   coding.h $(config_h)
 xselect.o: xselect.c dispextern.h frame.h xterm.h blockinput.h charset.h \
   coding.h ccl.h buffer.h atimer.h systime.h $(config_h)
@@ -1169,16 +1191,22 @@ relock:
 
 /* Arrange to make a tags table TAGS-LISP for ../lisp,
    plus TAGS for the C files, which includes ../lisp/TAGS by reference.  */
+
 ctagsfiles1 = [xyzXYZ]*.[hc] 
 ctagsfiles2 = [a-wA-W]*.[hc]
-TAGS: $(srcdir)/$(ctagsfiles)
+
+TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2)
        ../lib-src/etags --include=TAGS-LISP --include=${lwlibdir}/TAGS \
          --regex='/[   ]*DEFVAR_[A-Z_  (]+"\([^"]+\)"/' \
          $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2)
 frc:
 TAGS-LISP: frc
        $(MAKE) -f ${lispsource}Makefile TAGS-LISP ETAGS=../lib-src/etags
-tags: TAGS TAGS-LISP
+
+$(lwlibdir)TAGS:
+       (cd $(lwlibdir); $(MAKE) -f $(lwlibdir)Makefile tags ETAGS=../lib-src/etags)
+
+tags: TAGS TAGS-LISP $(lwlibdir)TAGS
 .PHONY: tags
 
 
@@ -1192,10 +1220,18 @@ bootstrap: bootstrap-emacs
 bootstrap-temacs: 
        LC_ALL=C $(MAKE) $(MFLAGS) temacs ALL_CFLAGS="$(ALL_CFLAGS) -DPURESIZE=5000000 -I../src"
 
+/* Build a DOC file.  */
+
+bootstrap-doc: ${libsrc}make-docfile
+       -rm -f ${etc}DOC
+       els=`echo ${shortlisp} ${SOME_MACHINE_LISP} \
+               | sed -e "s/\\.elc/.el/g"`; \
+       ${libsrc}make-docfile -d ${srcdir} $$els ${obj} > ${etc}DOC
+
 /* Dump an Emacs executable named bootstrap-emacs containing the 
    files from loadup.el in source form.  */
 
-bootstrap-emacs: bootstrap-temacs
+bootstrap-emacs: bootstrap-temacs bootstrap-doc
 #ifdef CANNOT_DUMP
        ln temacs bootstrap-emacs
 #else