(remove-overlays): Fix last change.

[gnu-emacs] / man / Makefile.in

diff --git a/man/Makefile.in b/man/Makefile.in
index b9b309855c9a43afcc9998d9e56712c987023384..61f775231ae8262eba462a44f69799f3e1846bfd 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,7 +1,7 @@
 #### Makefile for the Emacs Manual and other documentation.
 
-# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
-#  Free Software Foundation, Inc.
+# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+#   2004, 2005, 2006 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -17,8 +17,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Where to find the source code.  $(srcdir) will be the man
 # subdirectory of the source tree.  This is
@@ -31,8 +31,9 @@ VPATH=@srcdir@
 
 
 # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo
-INFO_TARGETS = ../info/emacs ../info/emacs-xtra ../info/ccmode ../info/cl \
+# Use --force so that it generates output even if there are errors.
+MAKEINFO = makeinfo --force
+INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
                ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
                ../info/message ../info/sieve ../info/pgg ../info/emacs-mime \
                ../info/info ../info/mh-e ../info/reftex \
@@ -41,7 +42,7 @@ INFO_TARGETS = ../info/emacs ../info/emacs-xtra ../info/ccmode ../info/cl \
                ../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
                ../info/woman ../info/eshell ../info/org ../info/url \
                ../info/speedbar ../info/tramp ../info/ses ../info/smtpmail \
-               ../info/flymake
+               ../info/flymake ../info/newsticker ../info/rcirc ../info/erc
 DVI_TARGETS =  emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
                 ediff.dvi forms.dvi gnus.dvi message.dvi emacs-mime.dvi \
                  gnus.dvi message.dvi sieve.dvi pgg.dvi mh-e.dvi \
@@ -49,7 +50,7 @@ DVI_TARGETS =         emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
                 ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
                 pcl-cvs.dvi woman.dvi eshell.dvi org.dvi url.dvi \
                 speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi flymake.dvi \
-                 emacs-xtra.dvi
+                 newsticker.dvi emacs-xtra.dvi rcirc.dvi erc.dvi
 INFOSOURCES = info.texi
 
 # The following rule does not work with all versions of `make'.
@@ -60,6 +61,18 @@ INFOSOURCES = info.texi
 TEXI2DVI = texi2dvi
 ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
 
+EMACS_XTRA=\
+       $(srcdir)/arevert-xtra.texi \
+       $(srcdir)/cal-xtra.texi \
+       $(srcdir)/dired-xtra.texi \
+       $(srcdir)/picture-xtra.texi \
+       $(srcdir)/emerge-xtra.texi \
+       $(srcdir)/vc-xtra.texi \
+       $(srcdir)/vc1-xtra.texi \
+       $(srcdir)/vc2-xtra.texi \
+       $(srcdir)/fortran-xtra.texi \
+       $(srcdir)/msdog-xtra.texi
+
 EMACSSOURCES= \
        ${srcdir}/emacs.texi \
        ${srcdir}/doclicense.texi \
@@ -88,7 +101,6 @@ EMACSSOURCES= \
        ${srcdir}/building.texi \
        ${srcdir}/maintaining.texi \
        ${srcdir}/abbrevs.texi \
-       ${srcdir}/picture.texi \
        ${srcdir}/sending.texi \
        ${srcdir}/rmail.texi \
        ${srcdir}/dired.texi \
@@ -104,7 +116,8 @@ EMACSSOURCES= \
        ${srcdir}/gnu.texi \
        ${srcdir}/glossary.texi \
        ${srcdir}/ack.texi \
-       ${srcdir}/kmacro.texi
+       ${srcdir}/kmacro.texi \
+       $(EMACS_XTRA)
 
 info: $(top_srcdir)/info $(INFO_TARGETS)
 
@@ -131,7 +144,7 @@ info.dvi: ${INFOSOURCES}
 ../info/emacs: ${EMACSSOURCES}
        cd $(srcdir); $(MAKEINFO) emacs.texi
 
-emacs.dvi: ${EMACSSOURCES}
+emacs.dvi: ${EMACSSOURCES} $(srcdir)/xresmini.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
 
 # This target is here so you could easily get the list of the *.texi
@@ -176,9 +189,7 @@ dired-x.dvi: dired-x.texi
 ediff.dvi: ediff.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
 
-../info/emacs-xtra: emacs-xtra.texi
-       cd $(srcdir); $(MAKEINFO) emacs-xtra.texi
-emacs-xtra.dvi: emacs-xtra.texi
+emacs-xtra.dvi: emacs-xtra.texi $(EMACS_XTRA)
        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi
 
 ../info/forms: forms.texi
@@ -321,6 +332,21 @@ smtpmail.dvi: smtpmail.texi
 flymake.dvi: flymake.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
 
+../info/newsticker: newsticker.texi
+       cd $(srcdir); $(MAKEINFO) newsticker.texi
+newsticker.dvi: newsticker.texi
+       $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
+
+../info/rcirc: rcirc.texi
+       cd $(srcdir); $(MAKEINFO) rcirc.texi
+rcirc.dvi: rcirc.texi
+       $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
+
+../info/erc: erc.texi
+       cd $(srcdir); $(MAKEINFO) erc.texi
+erc.dvi: erc.texi
+       $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
+
 mostlyclean:
        rm -f *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*