Merge from mainline.

[bpt/emacs.git] / doc / misc / makefile.w32-in

diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index 5af65f1..1c5fec4 100644 (file)
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -1,13 +1,14 @@
 #### -*- Makefile -*- for documentation other than the Emacs manual.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
-# GNU Emacs is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +16,8 @@
 # GNU General Public License for more details.
 
 # 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., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 # Where to find the source code.  The source code for Emacs's C kernel is
 # expected to be in $(srcdir)/src, and the source code for Emacs's
@@ -44,16 +44,19 @@ INFO_TARGETS = $(infodir)/ccmode \
                $(infodir)/tramp $(infodir)/ses $(infodir)/smtpmail \
                $(infodir)/flymake $(infodir)/newsticker $(infodir)/rcirc \
                $(infodir)/erc $(infodir)/remember $(infodir)/nxml-mode \
-               $(infodir)/epa
+               $(infodir)/epa $(infodir)/mairix-el $(infodir)/sasl \
+               $(infodir)/auth $(infodir)/eieio $(infodir)/ede \
+               $(infodir)/semantic $(infodir)/edt
 DVI_TARGETS = calc.dvi cc-mode.dvi cl.dvi dbus.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 \
+               sieve.dvi pgg.dvi mh-e.dvi \
                reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.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 \
                newsticker.dvi rcirc.dvi erc.dvi remember.dvi nxml-mode.dvi \
-               epa.dvi
+               epa.dvi mairix-el.dvi sasl.dvi auth.dvi eieio.dvi ede.dvi \
+               semantic.dvi edt.dvi
 INFOSOURCES = info.texi
 
 # The following rule does not work with all versions of `make'.
@@ -185,6 +188,11 @@ $(infodir)/remember: remember.texi
 remember.dvi: remember.texi
        $(ENVADD) $(TEXI2DVI) $(srcdir)/remember.texi
 
+$(infodir)/sasl: sasl.texi
+       $(MAKEINFO) sasl.texi
+sasl.dvi: sasl.texi
+       $(ENVADD) $(TEXI2DVI) $(srcdir)/sasl.texi
+
 $(infodir)/sc: sc.texi
        $(MAKEINFO) sc.texi
 sc.dvi: sc.texi
@@ -298,6 +306,36 @@ $(infodir)/epa: epa.texi
 epa.dvi: epa.texi
        $(ENVADD) $(TEXI2DVI) $(srcdir)/epa.texi
 
+$(infodir)/mairix-el: mairix-el.texi
+       $(MAKEINFO) mairix-el.texi
+mairix-el.dvi: mairix-el.texi
+       $(ENVADD) $(TEXI2DVI) $(srcdir)/mairix-el.texi
+
+$(infodir)/auth: auth.texi
+       $(MAKEINFO) auth.texi
+auth.dvi: auth.texi
+       $(ENVADD) $(TEXI2DVI) $(srcdir)/auth.texi
+
+$(infodir)/eieio: eieio.texi
+       $(MAKEINFO) eieio.texi
+eieio.dvi: eieio.texi
+       $(ENVADD) $(TEXI2DVI) $(srcdir)/eieio.texi
+
+$(infodir)/ede: ede.texi
+       $(MAKEINFO) ede.texi
+ede.dvi: ede.texi
+       $(ENVADD) $(TEXI2DVI) $(srcdir)/ede.texi
+
+$(infodir)/semantic: semantic.texi
+       $(MAKEINFO) semantic.texi
+semantic.dvi: semantic.texi
+       $(ENVADD) $(TEXI2DVI) $(srcdir)/semantic.texi
+
+$(infodir)/edt: edt.texi
+       $(MAKEINFO) edt.texi
+edt.dvi: edt.texi
+       $(ENVADD) $(TEXI2DVI) $(srcdir)/edt.texi
+
 mostlyclean:
        - $(DEL) *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
 
@@ -322,9 +360,13 @@ clean: mostlyclean
                 $(infodir)/sieve* $(infodir)/pgg* \
                 $(infodir)/erc* $(infodir)/rcirc* \
                 $(infodir)/remember* $(infodir)/nxml-mode* \
-                $(infodir)/epa*
+                $(infodir)/epa* $(infodir)/sasl* \
+                $(infodir)/mairix-el* $(infodir)/auth* \
+                $(infodir)/eieio* $(infodir)/ede* \
+                $(infodir)/semantic* $(infodir)edt*
 
 distclean: clean
+       - $(DEL) makefile
 
 maintainer-clean: distclean
        - $(DEL) *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc