X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0498520b279d579fe9e125f99e0bbc93f2f802f7..cedf175b492f299fac0e8165730472a731915248:/man/makefile.w32-in

diff --git a/man/makefile.w32-in b/man/makefile.w32-in
index 4ca90f18db..df5d4c4521 100644
--- a/man/makefile.w32-in
+++ b/man/makefile.w32-in
@@ -1,7 +1,6 @@
 #### -*- Makefile -*- for the Emacs Manual and other documentation.
 
-# Copyright (C) 2003
-#  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -17,8 +16,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.  The source code for Emacs's C kernel is
 # expected to be in $(srcdir)/src, and the source code for Emacs's
@@ -29,29 +28,29 @@ srcdir=.
 infodir = $(srcdir)/../info
 
 # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --force
 MULTI_INSTALL_INFO = $(srcdir)\..\nt\multi-install-info.bat
-INFO_TARGETS = $(infodir)/emacs $(infodir)/ccmode \
-		$(infodir)/cl $(infodir)/dired-x \
-		$(infodir)/ediff $(infodir)/forms \
-		$(infodir)/gnus $(infodir)/info \
-		$(infodir)/message $(infodir)/mh-e \
-		$(infodir)/reftex $(infodir)/sc \
-		$(infodir)/vip $(infodir)/viper \
-		$(infodir)/widget $(infodir)/efaq \
-		$(infodir)/ada-mode $(infodir)/autotype \
-		$(infodir)/calc $(infodir)/idlwave \
-		$(infodir)/eudc $(infodir)/ebrowse \
-		$(infodir)/pcl-cvs $(infodir)/woman \
-		$(infodir)/emacs-mime $(infodir)/eshell \
-		$(infodir)/speedbar $(infodir)/tramp \
-		$(infodir)/ses $(infodir)/smtpmail
+INFO_TARGETS = $(infodir)/emacs $(infodir)/emacs-xtra $(infodir)/ccmode \
+		$(infodir)/cl $(infodir)/dired-x $(infodir)/ediff \
+		$(infodir)/forms $(infodir)/gnus $(infodir)/message \
+		$(infodir)/sieve $(infodir)/pgg $(infodir)/emacs-mime \
+		$(infodir)/info $(infodir)/mh-e $(infodir)/reftex \
+		$(infodir)/sc $(infodir)/vip $(infodir)/viper \
+		$(infodir)/widget $(infodir)/efaq $(infodir)/ada-mode \
+		$(infodir)/autotype $(infodir)/calc $(infodir)/idlwave \
+		$(infodir)/eudc $(infodir)/ebrowse $(infodir)/pcl-cvs \
+		$(infodir)/woman $(infodir)/eshell $(infodir)/org \
+		$(infodir)/url $(infodir)/speedbar $(infodir)/tramp \
+		$(infodir)/ses $(infodir)/smtpmail $(infodir)/flymake \
+		$(infodir)/newsticker
 DVI_TARGETS = 	emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
-		 ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \
+		 ediff.dvi forms.dvi gnus.dvi message.dvi emacs-mime.dvi \
+                 gnus.dvi message.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 emacs-mime.dvi eshell.dvi \
-		 speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi
+		 pcl-cvs.dvi woman.dvi eshell.dvi org.dvi url.dvi \
+		 speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi flymake.dvi \
+                 newsticker.dvi emacs-xtra.dvi
 INFOSOURCES = info.texi
 
 # The following rule does not work with all versions of `make'.
@@ -110,7 +109,6 @@ EMACSSOURCES= \
 	$(srcdir)/kmacro.texi
 
 info: $(INFO_TARGETS)
-	$(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
 
 dvi: $(DVI_TARGETS)
 
@@ -122,9 +120,14 @@ dvi: $(DVI_TARGETS)
 # The following target uses an explicit -o switch to work around
 # the @setfilename directive in info.texi, which is required for
 # the Texinfo distribution.
+# Some Windows ports of makeinfo seem to require -o to come before the
+# texi filename, contrary to GNU standards.
+
+$(infodir)/dir:
+	$(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
 
 $(infodir)/info: $(INFOSOURCES)
-	$(MAKEINFO) --no-split info.texi -o $@
+	$(MAKEINFO) --no-split -o $@ info.texi
 
 info.dvi: $(INFOSOURCES)
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/info.texi
@@ -177,23 +180,44 @@ $(infodir)/ediff: ediff.texi
 ediff.dvi: ediff.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/ediff.texi
 
+$(infodir)/flymake: flymake.texi
+	$(MAKEINFO) flymake.texi
+flymake.dvi: flymake.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/flymake.texi
+
 $(infodir)/forms: forms.texi
 	$(MAKEINFO) forms.texi
 forms.dvi: forms.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/forms.texi
 
+# gnus/message/emacs-mime/sieve/pgg are part of Gnus:
 $(infodir)/gnus: gnus.texi
 	$(MAKEINFO) gnus.texi
 gnus.dvi: gnus.texi
-	sed -e '/@iflatex/,/@end iflatex/d' $(srcdir)/gnus.texi > gnustmp.texi 
+	sed -e "/@iflatex/,/@end iflatex/d" $(srcdir)/gnus.texi > gnustmp.texi
 	$(ENVADD) $(TEXI2DVI) gnustmp.texi
 	cp gnustmp.dvi $*.dvi
 	rm gnustmp.*
-
+#
 $(infodir)/message: message.texi
 	$(MAKEINFO) message.texi
 message.dvi: message.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/message.texi
+#
+$(infodir)/emacs-mime: emacs-mime.texi
+	$(MAKEINFO) emacs-mime.texi
+emacs-mime.dvi: emacs-mime.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-mime.texi
+#
+$(infodir)/sieve: sieve.texi
+	$(MAKEINFO) sieve.texi
+sieve.dvi: sieve.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/sieve.texi
+#
+$(infodir)/pgg: pgg.texi
+	$(MAKEINFO) pgg.texi
+pgg.dvi: pgg.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/pgg.texi
 
 $(infodir)/mh-e: mh-e.texi
 	$(MAKEINFO) mh-e.texi
@@ -271,11 +295,6 @@ $(infodir)/speedbar: speedbar.texi
 speedbar.dvi: speedbar.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/speedbar.texi
 
-$(infodir)/emacs-mime: emacs-mime.texi
-	$(MAKEINFO) emacs-mime.texi
-emacs-mime.dvi: emacs-mime.texi
-	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-mime.texi
-
 $(infodir)/tramp: tramp.texi
 	$(MAKEINFO) tramp.texi
 tramp.dvi: tramp.texi
@@ -291,6 +310,27 @@ $(infodir)/smtpmail: smtpmail.texi
 smtpmail.dvi: smtpmail.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/smtpmail.texi
 
+$(infodir)/emacs-xtra: emacs-xtra.texi
+	$(MAKEINFO) emacs-xtra.texi
+
+emacs-xtra.dvi: emacs-xtra.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-xtra.texi
+
+$(infodir)/org: org.texi
+	$(MAKEINFO) org.texi
+org.dvi: org.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/org.texi
+
+$(infodir)/url: url.texi
+	$(MAKEINFO) url.texi
+url.dvi: url.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/url.texi
+
+$(infodir)/newsticker: newsticker.texi
+	$(MAKEINFO) newsticker.texi
+newsticker.dvi: newsticker.texi
+	$(ENVADD) $(TEXI2DVI) $(srcdir)/newsticker.texi
+
 mostlyclean:
 	- $(DEL) *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
 
@@ -302,15 +342,16 @@ clean: mostlyclean
 		 $(infodir)/gnus* $(infodir)/info* \
 		 $(infodir)/message* $(infodir)/mh-e* \
 		 $(infodir)/reftex* $(infodir)/sc* \
-		 $(infodir)/vip* $(infodir)/viper* \
-		 $(infodir)/widget* $(infodir)/efaq* \
-		 $(infodir)/ada-mode* $(infodir)/autotype* \
-		 $(infodir)/calc* $(infodir)/idlwave* \
-		 $(infodir)/eudc* $(infodir)/ebrowse* \
-		 $(infodir)/pcl-cvs* $(infodir)/woman* \
-		 $(infodir)/emacs-mime* $(infodir)/eshell* \
+		 $(infodir)/vip* $(infodir)/widget* \
+		 $(infodir)/efaq* $(infodir)/ada-mode* \
+		 $(infodir)/autotype* $(infodir)/calc* \
+		 $(infodir)/idlwave* $(infodir)/eudc* \
+		 $(infodir)/ebrowse* $(infodir)/pcl-cvs* \
+		 $(infodir)/woman* $(infodir)/eshell* \
 		 $(infodir)/speedbar* $(infodir)/tramp* \
-		 $(infodir)/ses* $(infodir)/smtpmail*
+		 $(infodir)/ses* $(infodir)/smtpmail* \
+		 $(infodir)/url* $(infodir)/org* \
+		 $(infodir)/flymake*
 
 distclean: clean
 
@@ -325,5 +366,3 @@ maintainer-clean: distclean
 # That caused trouble because this is run entirely in the source directory.
 # Since we expect to get texi2dvi from elsewhere,
 # it is ok to expect texindex from elsewhere also.
-
-# arch-tag: 6e99da59-ad27-4816-82a0-cde9a101efae