[project @ 2000-05-09 15:37:07 by rrt]

Removed info and texinfo support.

mk/config.mk.in

@@ -380,7 +380,6 @@ datadir                 = @datadir@
 #sharedstatedir          = @sharedstatedir@
 #localstatedir           = @localstatedir@
 libdir                  = @libdir@
-infodir		        = @infodir@
 includedir              = @includedir@
 oldincludedir           = @oldincludedir@
 mandir			= @mandir@
@@ -413,9 +412,6 @@ endif
 ifeq "$(strip $(libdir))" ""
 libdir		= $(exec_prefix)/lib
 endif
-ifeq "$(strip $(infodir))" ""
-infodir		= $(prefix)/info
-endif
 ifeq "$(strip $(includedir))" ""
 includedir	= $(prefix)/include
 endif
@@ -486,8 +482,6 @@ MKDIRHIER_PREFIX	= $(GLAFP_UTILS)/mkdirhier/
 LITERATE	    	= $(FPTOOLS_TOP)/literate
 
 LITERATE_PREFIX    	= $(FPTOOLS_TOP)/literate/
-INFO_PREFIX    	        = $(FPTOOLS_TOP)/literate/info-utils/
-TEXI2HTML_PREFIX        = $(LITERATE_PREFIX)texi2html/
 
 HAPPY_PREFIX    	= $(FPTOOLS_TOP)/happy/src/
 GREENCARD_PREFIX	= $(FPTOOLS_TOP)/green-card/src/
@@ -676,17 +670,12 @@ BLD_DLL			= dllwrap
 #
 # Stuff from fptools/literate
 #
-INFO         		= $(UTIL_PREFIX)info
-MAKEINFO     		= $(INFO_PREFIX)makeinfo
-POSTMAKEINFO 		= $(INFO_PREFIX)postmakeinfo
 LIT2PGM 		= $(LITERATE_PREFIX)lit2pgm
-LIT2TEXI      		= $(LITERATE_PREFIX)lit2texi
 LIT2HTML      		= $(LITERATE_PREFIX)lit2html
 LIT2LATEX     		= $(LITERATE_PREFIX)lit2latex
 MKDEPENDLIT   		= $(LITERATE_PREFIX)mkdependlit
 LIT2CHANGELOG 		= $(LITERATE_PREFIX)lit2changelog
 LIT2TEXT 		= $(LITERATE_PREFIX)lit2text
-TEXI2HTML               = $(TEXI2HTML_PREFIX)texi2html
 
 #
 # Stuff from fptools/ghc/utils

mk/opts.mk

@@ -5,14 +5,14 @@
 #	This file defines Make variables for the
 #	option flags for each utility program
 #
-# 	$Id: opts.mk,v 1.14 2000/05/08 14:54:58 rrt Exp $
+# 	$Id: opts.mk,v 1.15 2000/05/09 15:37:08 rrt Exp $
 #
 #################################################################################
 
 # Exports:	Define P_OPTS for the most important utility programs, P, namely
 #
 #		AR AS CPP CTAGS C FLEX HC HSTAGS LD LINT 
-#		LIT2CHANGELOG LIT2HTML LIT2LATEX LIT2PGM LIT2TEXI
+#		LIT2CHANGELOG LIT2HTML LIT2LATEX LIT2PGM
 #		MKDEPENDC MKDEPENDHS MKDEPENDLIT MSUB
 #		RUNTEST UGEN UNLIT YACC          
 
@@ -57,15 +57,6 @@ SRC_INSTALL_BIN_OPTS	+= -s
 SRC_LINT_OPTS		+= -axz -DLINT $(SRC_CPP_OPTS)
 WAY$(_way)_LINT_OPTS	+= WAY$(_way)_CPP_OPTS
 
-
-# Default fptools options for texi2html:
-#
-#  - each node in separate file.
-#  - handle texi menus and glossaries.
-#
-# 
-SRC_TEXI2HTML_OPTS +=-menu -verbose -glossary
-
 #
 # Default fptools options for dllwrap.
 #
@@ -107,8 +98,6 @@ LIT2CHANGELOG_OPTS = $(SRC_LIT2CHANGELOG_OPTS) $(WAY$(_way)_LIT2CHANGELOG_OPTS)
 LIT2HTML_OPTS      = $(SRC_LIT2HTML_OPTS) $(WAY$(_way)_LIT2HTML_OPTS) $(EXTRA_LIT2HTML_OPTS)
 LIT2LATEX_OPTS     = $(SRC_LIT2LATEX_OPTS) $(WAY$(_way)_LIT2LATEX_OPTS) $(EXTRA_LIT2LATEX_OPTS)
 LIT2PGM_OPTS       = $(SRC_LIT2PGM_OPTS) $(WAY$(_way)_LIT2PGM_OPTS) $(EXTRA_LIT2PGM_OPTS)
-LIT2TEXI_OPTS      = $(SRC_LIT2TEXI_OPTS) $(WAY$(_way)_LIT2TEXI_OPTS) $(EXTRA_LIT2TEXI_OPTS)
-TEXI2HTML_OPTS     = $(SRC_TEXI2HTML_OPTS) $(WAY$(_way)_TEXI2HTML_OPTS) $(EXTRA_TEXI2HTML_OPTS)
 MKDEPENDC_OPTS     = $(SRC_MKDEPENDC_OPTS) $(WAY$(_way)_MKDEPENDC_OPTS) $(EXTRA_MKDEPENDC_OPTS)
 MKDEPENDHS_OPTS    = $(SRC_MKDEPENDHS_OPTS) $(WAY$(_way)_MKDEPENDHS_OPTS) \
                      $(EXTRA_MKDEPENDHS_OPTS)
@@ -116,6 +105,7 @@ MKDEPENDLIT_OPTS   = $(SRC_MKDEPENDLIT_OPTS) $(WAY$(_way)_MKDEPENDLIT_OPTS) \
                      $(EXTRA_MKDEPENDLIT_OPTS)
 SGML2DVI_OPTS      = $(SRC_SGML2DVI_OPTS) $(WAY$(_way)_SGML2DVI_OPTS) $(EXTRA_SGML2DVI_OPTS)
 SGML2PS_OPTS       = $(SRC_SGML2PS_OPTS) $(WAY$(_way)_SGML2PS_OPTS) $(EXTRA_SGML2PS_OPTS)
+SGML2PDF_OPTS      = $(SRC_SGML2PDF_OPTS) $(WAY$(_way)_SGML2PDF_OPTS) $(EXTRA_SGML2PDF_OPTS)
 SGML2RTF_OPTS      = $(SRC_SGML2RTF_OPTS) $(WAY$(_way)_SGML2RTF_OPTS) $(EXTRA_SGML2RTF_OPTS)
 SGML2HTML_OPTS     = $(SRC_SGML2HTML_OPTS) $(WAY$(_way)_SGML2HTML_OPTS) $(EXTRA_SGML2HTML_OPTS)
 UGEN_OPTS          = $(SRC_UGEN_OPTS) $(WAY$(_way)_UGEN_OPTS) $(EXTRA_UGEN_OPTS)

mk/paths.mk

@@ -169,7 +169,7 @@ MAINTAINER_CLEAN_FILES += .depend $(BOOT_SRCS)
 MOSTLY_CLEAN_FILES += \
  *.CKP *.ln *.BAK *.bak .*.bak *.o *core a.out errs ,* *.a .emacs_*  \
  tags TAGS *.ind *.ilg *.idx *.idx-prev *.aux *.aux-prev *.dvi *.log \
- *.toc *.lot *.lof *.blg *.info *.itxi *.itex *.ihtml *.cb
+ *.toc *.lot *.lof *.blg *.cb
 
 #------------------------------------------------------------------
 #

mk/target.mk

@@ -18,7 +18,7 @@
 #	install* uninstall installcheck installdirs
 #	clean* distclean* mostlyclean* maintainer-clean*
 #	tags*
-#	info dvi ps
+#	dvi ps (no info) FPTOOLS adds: pdf rtf html
 #	dist binary-dist
 #	check
 #
@@ -80,7 +80,7 @@
 
 ifneq "$(SUBDIRS)" ""
 
-all docs runtests boot TAGS clean distclean mostlyclean maintainer-clean install info html ps dvi txt::
+all docs runtests boot TAGS clean distclean mostlyclean maintainer-clean install html ps dvi txt::
 	@echo "------------------------------------------------------------------------"
 	@echo "===fptools== Recursively making \`$@' in $(SUBDIRS) ..."
 	@echo "PWD = $(shell pwd)"
@@ -201,9 +201,7 @@ boot :: depend
 # 
 # `all'
 #      Compile the entire program. This should be the default target.
-#      This target need not rebuild any documentation files; Info files
-#      should normally be included in the distribution, and DVI files
-#      should be made only when explicitly asked for.
+#      This target need not rebuild any documentation files
 # 
 # `install'
 #      Compile the program and copy the executables, libraries, and so on
@@ -222,27 +220,6 @@ boot :: depend
 #      will ignore any errors.  This is in case there are systems that
 #      don't have the Unix man page documentation system installed.
 # 
-#      The way to install Info files is to copy them into `$(infodir)'
-#      with $(INSTALL_DATA) (see Command Variables), and then run the
-#      install-info program if it is present.  install-info is a script
-#      that edits the Info `dir' file to add or update the menu entry for
-#      the given Info file; it will be part of the Texinfo package. Here
-#      is a sample rule to install an Info file:
-# 
-# 	     $(infodir)/foo.info: foo.info # There may be a newer info
-# 	     file in . than in srcdir.
-# 		     -if test -f foo.info; then d=.; \
-# 		      else d=$(srcdir); fi; \ $(INSTALL_DATA)
-# 		     $$d/foo.info $@; \ # Run install-info only if it
-# 	     exists.  # Use `if' instead of just prepending `-' to the
-# 	     # line so we notice real errors from install-info.  # We
-# 	     use `$(SHELL) -c' because some shells do not # fail
-# 	     gracefully when there is an unknown command.
-# 		     if $(SHELL) -c 'install-info --version' \
-# 			>/dev/null 2>&1; then \ install-info
-# 		       --infodir=$(infodir) $$d/foo.info; \ else true;
-# 		     fi
-# 
 # `uninstall'
 #      Delete all the installed files that the `install' target would
 #      create (but not the noninstalled files such as `make all' would
@@ -276,7 +253,7 @@ boot :: depend
 #      Delete everything from the current directory that can be
 #      reconstructed with this Makefile.  This typically includes
 #      everything deleted by distclean , plus more: C source files
-#      produced by Bison, tags tables, Info files, and so on.
+#      produced by Bison, tags tables, and so on.
 # 
 #      One exception, however: `make maintainer-clean' should not delete
 #      `configure' even if `configure' can be remade using a rule in the
@@ -287,40 +264,17 @@ boot :: depend
 # `TAGS'
 #      Update a tags table for this program.
 # 
-# `info'
-#      Generate any Info files needed. The best way to write the rules is
-#      as follows:
-# 
-# 	     info: foo.info
-# 
-# 	     foo.info: foo.texi chap1.texi chap2.texi
-# 		     $(MAKEINFO) $(srcdir)/foo.texi
-# 
-#      You must define the variable MAKEINFO in the Makefile. It should
-#      run the makeinfo program, which is part of the Texinfo
-#      distribution.
-# 
-# `dvi' `ps'
-#      Generate DVI files for all TeXinfo documentation. For example:
-# 
-# 	     dvi: foo.dvi
-# 
-# 	     foo.dvi: foo.texi chap1.texi chap2.texi
-# 		     $(TEXI2DVI) $(srcdir)/foo.texi
-# 
-#      You must define the variable TEXI2DVI in the Makefile. It should
-#      run the program texi2dvi , which is part of the Texinfo
-#      distribution. Alternatively, write just the dependencies, and
-#      allow GNU Make to provide the command.
+# `dvi' `ps' `pdf' `html' `pdf'
+#      Generate DVI/PS/PDF files for LaTeX/DocBook docs. Not everything is
+#      supported everywhere, but the intention is to standardise on DocBook
+#      producing all formats.
 #
-#      ps is a FPtools addition for Postscript files
-# 
 # `dist' `binary-dist'
 #      Create a distribution tar file for this program. The tar file
 #      should be set up so that the file names in the tar file start with
 #      a subdirectory name which is the name of the package it is a
 #      distribution for. This name can include the version number.
-# 
+#
 #      For example, the distribution tar file of GCC version 1.40 unpacks
 #      into a subdirectory named `gcc-1.40'.
 # 
@@ -944,7 +898,7 @@ dist-package-zip ::
 
 ###########################################
 #
-#	Targets: check tags show info
+#	Targets: check tags show
 #
 ###########################################
 
@@ -1017,7 +971,7 @@ SGML_HTML = $(SGML_DOC).html
 # HTML output goes in a subdirectory on its own.
 SGML_TEXT = $(SGML_DOC).txt
 
-$(SGML_DVI) $(SGML_PS) $(SGML_INFO) $(SGML_HTML) $(SGML_TEXT) :: $(SGML_SRCS)
+$(SGML_DVI) $(SGML_PS) $(SGML_HTML) $(SGML_TEXT) :: $(SGML_SRCS)
 
 dvi  :: $(SGML_DVI)
 ps   :: $(SGML_PS)