[project @ 2003-08-18 15:45:07 by panne]

Don't build ltx and sgmlverb, they are unused. With this change, the
test for flex/lex can be removed from the configuration process. The
make rules for flex/lex files are still in mk, but they could be moved
to glafp-utils/mk if someone feels the need for this.

Nuked ancient "msub" stuff and a CVS keyword on the way.

diff --git a/configure.ac b/configure.ac
index 64ae59c..d56d0ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -656,10 +656,6 @@ FPTOOLS_PROG_DIFF
 dnl ** Find find command (for Win32's benefit)
 FPTOOLS_FIND_FIND
 
-dnl ** Find lex command (flex or lex)
-AC_PROG_LEX
-test -z "$LEX" && AC_MSG_WARN(['flex' or 'lex' not found])
-
 dnl ** figure out how to do a BSD-ish install
 AC_PROG_INSTALL
 

diff --git a/glafp-utils/Makefile b/glafp-utils/Makefile
index 3bc1baa..3ce9eb5 100644 (file)
--- a/glafp-utils/Makefile
+++ b/glafp-utils/Makefile
@@ -11,10 +11,7 @@ include $(TOP)/mk/boilerplate.mk
 
 # We need to write mkdependC first (in that order), to be sure that
 # make depend will succeed in all the other directories.
-#
-# ToDo: remove msub for good
-#
-SUBDIRS = mkdependC ltx mkdirhier runstdtest sgmlverb docbook
+SUBDIRS = mkdependC mkdirhier runstdtest docbook
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 SUBDIRS += lndir
 endif

diff --git a/glafp-utils/mk/boilerplate.mk b/glafp-utils/mk/boilerplate.mk
index e85cfe9..e645586 100644 (file)
--- a/glafp-utils/mk/boilerplate.mk
+++ b/glafp-utils/mk/boilerplate.mk
@@ -26,7 +26,6 @@ TOP:=$(GLAFP_UTILS_TOP)
 # -----------------------------------------------------------------
 
 #Not currently used: -include $(GLAFP_UTILS_TOP)/mk/paths.mk
--include $(GLAFP_UTILS_TOP)/mk/opts.mk
 #Not currently used: -include $(GLAFP_UTILS_TOP)/mk/suffix.mk
 
 # No ways, please

diff --git a/glafp-utils/mk/opts.mk b/glafp-utils/mk/opts.mk
deleted file mode 100644 (file)
index 3cbdc96..0000000
--- a/glafp-utils/mk/opts.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# glafp-utils options
-#
-
-#
-# msub'ing with the following
-#
-MSUB_OPTS += -f Makefile -f $(FPTOOLS_TOP)/mk/config.mk
-

diff --git a/glafp-utils/mk/target.mk b/glafp-utils/mk/target.mk
index d4cb7e3..a2ed36c 100644 (file)
--- a/glafp-utils/mk/target.mk
+++ b/glafp-utils/mk/target.mk
@@ -1,5 +1,3 @@
-# -----------------------------------------------------------------------------
-# $Id: target.mk,v 1.2 2002/02/12 15:17:24 simonmar Exp $
 #
 # (c) The GHC Team 2000
 # 

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 4ad34d2..9493bb7 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -595,7 +595,6 @@ RUNTEST_PREFIX              = $(GLAFP_UTILS)/runstdtest/
 VERBATIM_PREFIX                = $(GLAFP_UTILS)/verbatim/
 SGMLVERB_PREFIX                = $(GLAFP_UTILS)/sgmlverb/
 ETAGS_PREFIX           = $(GLAFP_UTILS)/etags/
-MSUB_PREFIX            = $(GLAFP_UTILS)/msub/
 LNDIR_PREFIX           = $(GLAFP_UTILS)/lndir/
 MKDIRHIER_PREFIX       = $(GLAFP_UTILS)/mkdirhier/
 DOCBOOK_PREFIX         = $(GLAFP_UTILS)/docbook/
@@ -708,11 +707,11 @@ GTK_CONFIG                = @GTK_CONFIG@
 GTK_VERSION            = @GTK_VERSION@
 
 #-----------------------------------------------------------------------------
-# Flex
+# Flex (currently unused, could be moved to glafp-utils)
 
-FLEX                   = @LEX@
+# FLEX                 = @LEX@
 # Don't bother with -lfl, we define our own yywrap()s anyway.
-FLEX_LIB               = 
+# FLEX_LIB             = 
 #WAS:FLEX_LIB          = @LEXLIB@
 
 #-----------------------------------------------------------------------------
@@ -839,7 +838,6 @@ MKDEPENDC           = $(MKDEPENDC_PREFIX)mkdependC
 LTX                    = $(LTX_PREFIX)ltx
 MKDIRHIER              = $(MKDIRHIER_PREFIX)mkdirhier
 LNDIR                  = $(LNDIR_PREFIX)lndir
-MSUB                   = $(MSUB_PREFIX)msub
 ETAGS                  = $(ETAGS_PREFIX)etags
 VERBATIM               = $(VERBATIM_PREFIX)verbatim
 SGMLVERB               = $(SGMLVERB_PREFIX)sgmlverb

diff --git a/mk/opts.mk b/mk/opts.mk
index bfa0ef0..1c8e189 100644 (file)
--- a/mk/opts.mk
+++ b/mk/opts.mk
@@ -5,7 +5,7 @@
 #      This file defines Make variables for the
 #      option flags for each utility program
 #
-#      $Id: opts.mk,v 1.33 2003/08/18 13:54:06 panne Exp $
+#      $Id: opts.mk,v 1.34 2003/08/18 15:45:09 panne Exp $
 #
 #################################################################################
 
@@ -17,8 +17,8 @@
 #
 #              AR AS CPP CTAGS C FLEX HC HSTAGS LD LINT 
 #              LIT2CHANGELOG LIT2HTML LIT2LATEX LIT2PGM
-#              MKDEPENDC MKDEPENDHS MKDEPENDLIT MSUB
-#              RUNTEST UNLIT          
+#              MKDEPENDC MKDEPENDHS MKDEPENDLIT RUNTEST
+#              UNLIT          
 
 
 # For each such utility program P, this file defines