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.
dnl ** Find find command (for Win32's benefit)
FPTOOLS_FIND_FIND
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
dnl ** figure out how to do a BSD-ish install
AC_PROG_INSTALL
# We need to write mkdependC first (in that order), to be sure that
# make depend will succeed in all the other directories.
# 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
ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
SUBDIRS += lndir
endif
# -----------------------------------------------------------------
#Not currently used: -include $(GLAFP_UTILS_TOP)/mk/paths.mk
# -----------------------------------------------------------------
#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
#Not currently used: -include $(GLAFP_UTILS_TOP)/mk/suffix.mk
# No ways, please
+++ /dev/null
-#
-# glafp-utils options
-#
-
-#
-# msub'ing with the following
-#
-MSUB_OPTS += -f Makefile -f $(FPTOOLS_TOP)/mk/config.mk
-
-# -----------------------------------------------------------------------------
-# $Id: target.mk,v 1.2 2002/02/12 15:17:24 simonmar Exp $
#
# (c) The GHC Team 2000
#
#
# (c) The GHC Team 2000
#
VERBATIM_PREFIX = $(GLAFP_UTILS)/verbatim/
SGMLVERB_PREFIX = $(GLAFP_UTILS)/sgmlverb/
ETAGS_PREFIX = $(GLAFP_UTILS)/etags/
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/
LNDIR_PREFIX = $(GLAFP_UTILS)/lndir/
MKDIRHIER_PREFIX = $(GLAFP_UTILS)/mkdirhier/
DOCBOOK_PREFIX = $(GLAFP_UTILS)/docbook/
GTK_VERSION = @GTK_VERSION@
#-----------------------------------------------------------------------------
GTK_VERSION = @GTK_VERSION@
#-----------------------------------------------------------------------------
+# Flex (currently unused, could be moved to glafp-utils)
# Don't bother with -lfl, we define our own yywrap()s anyway.
# Don't bother with -lfl, we define our own yywrap()s anyway.
#WAS:FLEX_LIB = @LEXLIB@
#-----------------------------------------------------------------------------
#WAS:FLEX_LIB = @LEXLIB@
#-----------------------------------------------------------------------------
LTX = $(LTX_PREFIX)ltx
MKDIRHIER = $(MKDIRHIER_PREFIX)mkdirhier
LNDIR = $(LNDIR_PREFIX)lndir
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
ETAGS = $(ETAGS_PREFIX)etags
VERBATIM = $(VERBATIM_PREFIX)verbatim
SGMLVERB = $(SGMLVERB_PREFIX)sgmlverb
# This file defines Make variables for the
# option flags for each utility program
#
# 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 $
#
#################################################################################
#
#################################################################################
#
# AR AS CPP CTAGS C FLEX HC HSTAGS LD LINT
# LIT2CHANGELOG LIT2HTML LIT2LATEX LIT2PGM
#
# 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
# For each such utility program P, this file defines