merge trunk

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

diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in
index d34ab66..4ccecbb 100644 (file)
--- a/doc/emacs/makefile.w32-in
+++ b/doc/emacs/makefile.w32-in
@@ -1,13 +1,13 @@
 #### -*- Makefile -*- for the Emacs Manual
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 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 +15,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
@@ -28,9 +27,12 @@ srcdir=.
 infodir = $(srcdir)/../../info
 
 # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo
+MAKEINFO_OPTS = --force --enable-encoding -I$(srcdir)
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
-INFO_TARGETS = $(infodir)/emacs
+INFO_EXT=.info
+INFO_OPTS=--no-split
+INFO_TARGETS = $(infodir)/emacs$(INFO_EXT)
 DVI_TARGETS =  emacs.dvi
 INFOSOURCES = info.texi
 
@@ -41,7 +43,7 @@ INFOSOURCES = info.texi
 
 TEXI2DVI = texi2dvi
 ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
-        "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C
+        "MAKEINFO=$(MAKEINFO) $(MAKEINFO_OPTS)" /C
 
 EMACS_XTRA=\
        $(srcdir)/arevert-xtra.texi \
@@ -51,12 +53,12 @@ EMACS_XTRA=\
        $(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)/emacsver.texi \
        $(srcdir)/doclicense.texi \
        $(srcdir)/screen.texi \
        $(srcdir)/commands.texi \
@@ -76,7 +78,7 @@ EMACSSOURCES= \
        $(srcdir)/windows.texi \
        $(srcdir)/frames.texi \
        $(srcdir)/mule.texi \
-       $(srcdir)/major.texi \
+       $(srcdir)/modes.texi \
        $(srcdir)/indent.texi \
        $(srcdir)/text.texi \
        $(srcdir)/programs.texi \
@@ -88,6 +90,7 @@ EMACSSOURCES= \
        $(srcdir)/dired.texi \
        $(srcdir)/calendar.texi \
        $(srcdir)/misc.texi \
+       $(srcdir)/package.texi \
        $(srcdir)/custom.texi \
        $(srcdir)/trouble.texi \
        $(srcdir)/cmdargs.texi \
@@ -113,23 +116,29 @@ dvi: $(DVI_TARGETS)
 $(infodir)/dir:
        $(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
 
-$(infodir)/emacs: $(EMACSSOURCES)
-       $(MAKEINFO) emacs.texi
+$(infodir)/emacs$(INFO_EXT): $(EMACSSOURCES)
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ emacs.texi
 
 emacs.dvi: $(EMACSSOURCES)
        $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs.texi
 
+emacs.html: $(EMACSSOURCES)
+       $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ emacs.texi
+
 emacs-xtra.dvi: emacs-xtra.texi $(EMACS_XTRA)
        $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-xtra.texi
 
 mostlyclean:
        - $(DEL) *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
 
+## FIXME $(infodir)/emacs* deletes too much, eg emacs-mime.
 clean: mostlyclean
        - $(DEL) *.dvi
        - $(DEL) $(infodir)/emacs*
+       - $(DEL_TREE) emacs.html
 
 distclean: clean
+       - $(DEL) makefile
 
 maintainer-clean: distclean
        - $(DEL) *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc