X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=ca32292db8ee38bb22e1a2f083de0b5c7dbf9f28;hb=53ededd082a1efa78d54aaa855d7e7e76a8c7366;hp=93f131caafb9b9a2a52c755ab62afde1b7a1c813;hpb=52b327b9d76ca9b234d6ab05f18cd9c91d2c6607;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index 93f131c..ca32292 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -18,8 +18,7 @@
 #	install* uninstall installcheck installdirs
 #	clean* distclean* mostlyclean* maintainer-clean*
 #	tags*
-#	info dvi ps
-#	dist binary-dist
+#	dvi ps (no info) FPTOOLS adds: pdf rtf html
 #	check
 #
 # 3. Some of the above targets have a version that
@@ -51,7 +50,7 @@
 #
 # (b) when SUBDIRS is empty,
 #     for each "multi-way-target" <t>
-#     calls "make -way=w <t>" for each w in $(WAYS)
+#     calls "make way=w <t>" for each w in $(WAYS)
 #
 #     This has the effect of making the standard target
 #     in each of the specified ways (as well as in the normal way
@@ -80,7 +79,28 @@
 
 ifneq "$(SUBDIRS)" ""
 
-all docs runtests boot TAGS clean veryclean maintainer-clean install info html ps dvi txt::
+# we override the 'boot', 'all' and 'install' targets in the top
+# level Makefile. Some of the sub-projects also set 'boot' to empty.
+
+ifeq "$(NO_ALL_TARGET)" "YES"
+ALL_TARGET     =
+else
+ALL_TARGET     = all
+endif
+
+ifeq "$(NO_BOOT_TARGET)" "YES"
+BOOT_TARGET    =
+else
+BOOT_TARGET    = boot
+endif
+
+ifneq "$(NO_INSTALL_TARGET)" "YES"
+INSTALL_TARGET =
+else
+INSTALL_TARGET = install
+endif
+
+$(ALL_TARGET) docs runtests $(BOOT_TARGET) TAGS clean distclean mostlyclean maintainer-clean $(INSTALL_TARGET) html ps dvi txt::
 	@echo "------------------------------------------------------------------------"
 	@echo "===fptools== Recursively making \`$@' in $(SUBDIRS) ..."
 	@echo "PWD = $(shell pwd)"
@@ -100,40 +120,8 @@ all docs runtests boot TAGS clean veryclean maintainer-clean install info html p
 	@echo "PWD = $(shell pwd)"
 	@echo "------------------------------------------------------------------------"
 
-dist ::
-# Don't rely on -e working, instead we check exit return codes from sub-makes.
-	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(SUBDIRS) ; do \
-	  $(MKDIRHIER_PREFIX)mkdirhier $(SRC_DIST_DIR)/$$i; \
-	  $(MAKE) -C $$i $(MFLAGS) $@ SRC_DIST_DIR=$(SRC_DIST_DIR)/$$i; \
-	  if [ $$? -eq 0 ] ;  then true; else exit $$x_on_err; fi; \
-	done
 endif
 
-# The default dist rule:
-#
-# copy/link the contents of $(SRC_DIST_FILES) into the
-# shadow distribution tree. SRC_DIST_FILES contain the
-# build-generated files that you want to include in
-# a source distribution.
-#
-#
-ifneq "$(SRC_DIST_FILES)" ""
-dist::
-	@for i in $(SRC_DIST_FILES); do 		 \
-	  if ( echo "$$i" | grep "~" >/dev/null 2>&1 ); then	 \
-	    echo $(LN_S) `pwd`/`echo $$i | sed -e "s/^\([^~]*\)~.*/\1/g"` $(SRC_DIST_DIR)/`echo $$i | sed -e "s/.*~\(.*\)/\1/g"` ; \
-	    $(LN_S) `pwd`/`echo $$i | sed -e "s/^\([^~]*\)~.*/\1/g"` $(SRC_DIST_DIR)/`echo $$i | sed -e "s/.*~\(.*\)/\1/g"` ; \
-	  else \
-	    if (test -f "$$i"); then 			   \
-	      echo $(LN_S) `pwd`/$$i $(SRC_DIST_DIR)/$$i ; \
-	      $(LN_S) `pwd`/$$i $(SRC_DIST_DIR)/$$i ;	   \
-	     fi;					   \
-	  fi; \
-	done;
-endif
-
-
 #
 # Selectively building subdirectories.
 #
@@ -143,35 +131,6 @@ $(SUBDIRS) ::
 	  $(MAKE) -C $@ $(MFLAGS)
 endif
 
-ifneq "$(WAYS)" ""
-ifeq "$(way)" ""
-
-# NB: the targets exclude 
-#	boot info TAGS runtests
-# since these are way-independent
-all docs TAGS clean veryclean maintainer-clean install ::
-	@echo "------------------------------------------------------------------------"
-	@echo "===fptools== Recursively making \`$@' for ways: $(WAYS) ..."
-	@echo "PWD = $(shell pwd)"
-	@echo "------------------------------------------------------------------------"
-# Don't rely on -e working, instead we check exit return codes from sub-makes.
-	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(WAYS) ; do \
-	  echo "------------------------------------------------------------------------"; \
-	  echo "==fptools== $(MAKE) way=$$i $@;"; \
-	  echo "PWD = $(shell pwd)"; \
-	  echo "------------------------------------------------------------------------"; \
-	  $(MAKE) way=$$i --no-print-directory $(MFLAGS) $@ ; \
-	  if [ $$? -eq 0 ] ; then true; else exit $$x_on_err; fi; \
-	done
-	@echo "------------------------------------------------------------------------"
-	@echo "===fptools== Finished recursively making \`$@' for ways: $(WAYS) ..."
-	@echo "PWD = $(shell pwd)"
-	@echo "------------------------------------------------------------------------"
-
-endif
-endif
-
 ##################################################################
 # 		FPtools standard targets
 #
@@ -210,7 +169,7 @@ ifneq "$(MKDEPENDC_SRCS)" ""
 	$(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS) 
 endif
 ifneq "$(MKDEPENDHS_SRCS)" ""
-	$(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-optdep-o -optdep$(obj)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS)
+	$(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(HC_OPTS)) $(MKDEPENDHS_SRCS)
 endif
 
 
@@ -220,8 +179,12 @@ endif
 #  The boot target, at a minimum generates dependency information
 
 .PHONY: boot
-boot :: depend
 
+ifeq "$(NO_BOOT_TARGET)" "YES"
+boot ::
+else
+boot :: depend
+endif
 
 ##################################################################
 # 		GNU Standard targets
@@ -230,9 +193,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
@@ -251,27 +212,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
@@ -305,7 +245,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
@@ -316,53 +256,11 @@ 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'.
-# 
-#      The easiest way to do this is to create a subdirectory
-#      appropriately named, use ln or cp to install the proper files in
-#      it, and then tar that subdirectory.
-# 
-#      The dist target should explicitly depend on all non-source files
-#      that are in the distribution, to make sure they are up to date in
-#      the distribution. See Making Releases.
-#
-#	binary-dist is an FPtools addition for binary distributions
-# 
 # `check'
 #      Perform self-tests (if any). The user must build the program
 #      before running the tests, but need not install the program; you
@@ -413,8 +311,17 @@ boot :: depend
 ifneq "$(HS_PROG)" ""
 all :: $(HS_PROG)
 
+ifneq "$(BootingFromHc)" "YES"
 $(HS_PROG) :: $(HS_OBJS)
-	$(HC) -o $@ $(HC_OPTS) $(LD_OPTS) $(HS_OBJS) $(LIBS)
+	$(HC) -o $@ $(HC_OPTS) $(LD_OPTS) $(HS_OBJS)
+else
+# see bootstrap.mk
+$(HS_PROG) :: $(HS_OBJS)
+	$(CC) -o $@ $(HC_BOOT_CC_OPTS) $(HC_BOOT_LD_OPTS) $(HS_OBJS) $(HC_BOOT_LIBS)
+endif
+
+# for building a Haskell program, we add FptoolsHcOpts
+SRC_HC_OPTS += $(FptoolsHcOpts)
 endif
 
 #----------------------------------------
@@ -429,17 +336,93 @@ endif
 
 
 #----------------------------------------
+#	Building HsLibs libraries.
+#
+# Inputs:
+#   $(PACKAGE) is the name of the library to build
+#   $(IS_CBITS_LIB) should be "YES" for a "cbits" library
+#
+# Outputs:
+#   $(LIBRARY)		the name of the library.a
+#   $(GHIC_LIBRARY)	the name of the library.o (for GHCi)
+#   $(LIBOBJS)		objects to put in library
+#   $(STUBOBJS)		more objects to put in library
+# 
+# $(LIBOBJS) is set to $(HS_OBJS) or $(C_OBJS) depending
+# on whether or not it's a "cbits" library.  But you can
+# override this by setting $(LIBOBJS) yourself
+
+ifneq "$(PACKAGE)" ""
+
+# add syslib dependencies and current package name
+SRC_HC_OPTS += -package-name $(PACKAGE)
+SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS))
+
+ifeq "$(IS_CBITS_LIB)" "YES"
+_cbits := _cbits
+STUBOBJS += $(HSC_C_OBJS)
+# Add _hsc.c files to the cbits library
+C_SRCS += $(wildcard ../*_hsc.c)
+# Make .hsc.h include files from the directory above visible
+# (and the cbits/ library too).
+SRC_CC_OPTS += -I.. -I.
+endif
+
+ifneq "$(way)" "i"
+LIBRARY      = libHS$(PACKAGE)$(_cbits)$(_way).a
+GHCI_LIBRARY = HS$(PACKAGE)$(_cbits)$(_way).o
+else
+LIBRARY      = $(PACKAGE).dll
+endif
+
+ifneq "$(IS_CBITS_LIB)" "YES"
+WAYS=$(GhcLibWays)
+endif
+
+ifeq "$(LIBOBJS)" ""
+  ifeq "$(IS_CBITS_LIB)" "YES"
+  LIBOBJS = $(C_OBJS)
+  else
+  LIBOBJS = $(HS_OBJS)
+  endif
+endif
+
+ifeq "$(IS_CBITS_LIB)" "YES"
+override datadir:=$(libdir)/include
+INSTALL_DATAS += Hs$(shell perl -e 'print ucfirst "$(PACKAGE)"').h
+else
+SRC_CC_OPTS += -Icbits
+endif
+
+endif # PACKAGE
+
+#----------------------------------------
 #	Libraries/archives
+#
+# Build $(LIBRARY) from $(LIBOBJS)+$(STUBOBJS)
+#
+# Inputs:
+#   $(LIBOBJS)
+#   $(STUBOBJS)
+#
+# Outputs:
+#   Rule to build $(LIBRARY)
 
 ifneq "$(LIBRARY)" ""
 all :: $(LIBRARY)
 
-
+ifneq "$(way)" "i"
 define BUILD_LIB
 $(RM) $@
-$(AR) $(AR_OPTS) $@ $(LIBOBJS)
+$(AR) $(AR_OPTS) $@ $(STUBOBJS) $(LIBOBJS)
 $(RANLIB) $@
 endef
+else
+define BUILD_LIB
+$(RM) $@
+al -out:$@ $(STUBOBJS) $(LIBOBJS)
+endef
+endif
 
 #
 # For Haskell object files, we might have chosen to split
@@ -449,55 +432,181 @@ endef
 #
 
 ifneq "$(HS_SRCS)" ""
-ifneq "$(filter -split-objs,$(HC_OPTS))" ""
+ifeq "$(SplitObjs)" "YES"
+
+# can't split objs in way 'u', so we disable it here
+ifneq "$(way)" "u"
+
+SRC_HC_OPTS += -split-objs
+
+ifeq "$(ArSupportsInput)" ""
+define BUILD_LIB
+$(RM) $@
+(echo $(STUBOBJS); $(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o') | xargs ar q $@
+$(RANLIB) $@
+endef
+else
 define BUILD_LIB
 $(RM) $@
-TMPDIR=$(TMPDIR); export TMPDIR; $(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o' -print | xargs ar q $@
+echo $(STUBOBJS) > $@.list
+$(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o' >> $@.list
+$(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list
+$(RM) $@.list
 $(RANLIB) $@
 endef
-endif # $(filter...
 endif
 
+# Extra stuff for compiling Haskell files with $(SplitObjs):
+
+HC_SPLIT_PRE = \
+    $(RM) $@; if [ ! -d $(basename $@) ]; then mkdir $(basename $@); else \
+    $(FIND) $(basename $@) -name '*.$(way_)o' | xargs $(RM) __rm_food; fi
+ifeq "$(GhcWithInterpreter)" "YES"
+HC_SPLIT_POST = $(LD) -r -x -o $@ $(basename $@)/*.$(way_)o
+else
+HC_SPLIT_POST = touch $@
+endif # GhcWithInterpreter == YES
+
+SRC_HC_PRE_OPTS  += $(HC_SPLIT_PRE);
+SRC_HC_POST_OPTS += $(HC_SPLIT_POST);
+
+#
+# If (Haskell) object files are split, cleaning up 
+# consist of descending into the directories where
+# the myriads of object files have been put.
+#
+
+extraclean ::
+	$(FIND) $(patsubst %.$(way_)o,%,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food
+	-rmdir $(patsubst %.$(way_)o,%,$(HS_OBJS)) > /dev/null 2>&1
+
+endif # $(way) == u
+endif # $(SplitObjs)
+endif # $(HS_SRCS)
+
 #
 # Remove local symbols from library objects if requested.
 #
 
 ifeq "$(StripLibraries)" "YES"
-ifneq "$(filter -split-objs,$(HC_OPTS))" ""
+ifeq "$(SplitObjs)" "YES"
 SRC_HC_POST_OPTS += \
   for i in $(basename $@)/*; do \
-	ld -r -x -o $$i.tmp $$i; \
+	$(LD) -r -x -o $$i.tmp $$i; \
 	$(MV) $$i.tmp $$i; \
   done
 else
 SRC_HC_POST_OPTS += \
-  ld -r -x -o $@.tmp $@; $(MV) $@.tmp $@
-endif
-endif
+  $(LD) -r -x -o $@.tmp $@; $(MV) $@.tmp $@
+endif # SplitObjs
+endif # StripLibraries
 
-$(LIBRARY) :: $(LIBOBJS)
+$(LIBRARY) :: $(STUBOBJS) $(LIBOBJS)
 	$(BUILD_LIB)
-endif
+endif # LIBRARY = ""
+
+#--------------------------------------------------------------
+#	Build dynamically-linkable libraries for GHCi
+#
+# Build $(GHCI_LIBRARY) from $(LIBOBJS)+$(STUBOBJS)
+#
+# Why?  GHCi can only link .o files (at the moment), not .a files
+# so we have to build libFoo.o as well as libFoo.a
+#
+# Furthermore, GHCi currently never loads 
+# profiling libraries (or other non-std ways)
+#
+# Inputs:
+#   $(GHCI_LIBRARY)
+#
+# Outputs:
+#   Rule to build $(GHCI_LIBRARY)
+
+
+ifneq "$(GHCI_LIBRARY)" ""
+ifeq "$(way)" ""
+ifeq "$(GhcWithInterpreter)" "YES"
+
+
+INSTALL_LIBS += $(GHCI_LIBRARY)
+CLEAN_FILES += $(GHCI_LIBRARY)
+
+all :: $(GHCI_LIBRARY)
+
+ifneq "$(DONT_WANT_STD_GHCI_LIB_RULE)" "YES"
+# If you don't want to build GHCI_LIBRARY the 'standard' way,
+# set DONT_WANT_STD_GHCI_LIB_RULE to YES. The Prelude and
+# hslibs/Win32 uses this 'feature'.
+#
+$(GHCI_LIBRARY) :: $(LIBOBJS)
+	$(LD) -r -x -o $@ $(LIBOBJS) $(STUBOBJS)
+
+endif # DONT_WANT_STD_GHCI_LIB_RULE
+endif # GhcWithInterpreter
+endif # way
+endif # GHCI_LIBRARY != ""
+
 
 #----------------------------------------
 #	Building Win32 DLLs
 #
-ifeq "$(way)" "dll"
+
+ifeq "$(DLLized)" "YES"
+SRC_CC_OPTS += -DDLLized
+
+ifneq "$(PACKAGE)" ""
+
+SRC_BLD_DLL_OPTS += --export-all --output-def=HS$(PACKAGE)$(_cbits)$(_way).def DllVersionInfo.$(way_)o
+
+ifneq "$(PACKAGE) $(IS_CBITS_LIB)" "std YES"
+ifneq "$(PACKAGE)" "rts"
+SRC_BLD_DLL_OPTS += -lHSstd_cbits_imp -L$(GHC_LIB_DIR)/std/cbits
+SRC_BLD_DLL_OPTS += -lHSrts_$(way_)imp -L$(GHC_RUNTIME_DIR)
+ifneq "$(PACKAGE)" "std"
+  ifeq "$(IS_CBITS_LIB)" ""
+  SRC_BLD_DLL_OPTS += -lHSstd_$(way_)imp -L$(GHC_LIB_DIR)/std 
+  endif
+endif
+endif
+endif
+
+SRC_BLD_DLL_OPTS += -lgmp -L. -L$(GHC_RUNTIME_DIR)/gmp
+ifeq "$(IS_CBITS_LIB)" ""
+SRC_BLD_DLL_OPTS += $(patsubst %,-lHS%_$(way_)imp, $(PACKAGE_DEPS))
+SRC_BLD_DLL_OPTS += $(patsubst %,-L../%, $(PACKAGE_DEPS))
+endif
+ifneq "$(HAS_CBITS)" ""
+SRC_BLD_DLL_OPTS += -lHS$(PACKAGE)_cbits_imp -Lcbits
+endif
+SRC_BLD_DLL_OPTS += -lwsock32 -lwinmm
+
+endif # PACKAGE != ""
+
+SplitObjs = NO 
+
+ifneq "$(LIBRARY)" ""
+
+all :: DllVersionInfo.$(way_)o
 
 ifeq "$(DLL_NAME)" ""
-DLL_NAME = $(patsubst %.a, %.dll, $(subst lib,,$(LIBRARY)))
+DLL_NAME = $(patsubst %.a,%.dll,$(subst lib,,$(LIBRARY)))
+endif
+
+ifneq "$(DLL_NAME)" ""
+DLL_NAME := $(DLL_PEN)/$(DLL_NAME)
 endif
 
 all :: $(DLL_NAME)
 
 ifeq "$(DLL_IMPLIB_NAME)" ""
-DLL_IMPLIB_NAME = $(patsubst %.a, %_imp.a, $(LIBRARY))
+DLL_IMPLIB_NAME = $(patsubst %.a,%_imp.a,$(LIBRARY))
 endif
 
 $(DLL_NAME) :: $(LIBRARY)
-	$(BLD_DLL) --output-lib $(DLL_IMPLIB_NAME) -o $(DLL_NAME) $(LIBRARY) $(BLD_DLL_OPTS) 
-	touch dLL_ifs.hi
-endif
+	$(BLD_DLL) --output-lib $(DLL_IMPLIB_NAME) -o $(DLL_NAME) $(LIBRARY) $(BLD_DLL_OPTS)
+endif # LIBRARY != ""
+
+endif # DLLized
 
 #
 # Version information is baked into a DLL by having the DLL include DllVersionInfo.o.
@@ -505,7 +614,7 @@ endif
 # (both are given sensible defaults though.)
 #
 # Note: this will not work as expected with Cygwin B20.1; you need a more recent
-#       snapshot of binutils (to pick up windres bugfixes.)
+#       version of binutils (to pick up windres bugfixes.)
 
 ifndef DLL_VERSION
 DLL_VERSION=$(ProjectVersion)
@@ -535,14 +644,14 @@ endif
 # Little bit of lo-fi mangling to get at the right set of settings depending
 # on whether we're generating the VERSIONINFO for a DLL or EXE
 # 
-DLL_OR_EXE=$(subst VersionInfo.rc,,$@)
+DLL_OR_EXE=$(subst VersionInfo.$(way_)rc,,$@)
 VERSION_FT=$(subst Dll, 0x2L, $(subst Exe, 0x1L, $(DLL_OR_EXE)))
 VERSION_RES_NAME=$(subst Exe,$(EXE_VERSION_NAME), $(subst Dll, $(DLL_VERSION_NAME),$(DLL_OR_EXE)))
 VERSION_RES=$(subst Exe,$(EXE_VERSION), $(subst Dll, $(DLL_VERSION),$(DLL_OR_EXE)))
 VERSION_DESC=$(subst Exe,$(EXE_DESCRIPTION), $(subst Dll, $(DLL_DESCRIPTION),$(DLL_OR_EXE)))
 
-DllVersionInfo.rc ExeVersionInfo.rc:
-	$(RM) DllVersionInfo.rc
+DllVersionInfo.$(way_)rc ExeVersionInfo.$(way_)rc:
+	$(RM) DllVersionInfo.$(way_)rc
 	echo "1 VERSIONINFO"  		    > $@
 	echo "FILEVERSION 1,0,0,1"         >> $@
 	echo "PRODUCTVERSION 1,0,0,1"      >> $@
@@ -615,13 +724,7 @@ endif
 
 all :: $(SCRIPT_PROG)
 
-#
-# #! support under cygwin32 is not quite there yet, 
-# so we rely on the eval `trick' instead. On all other
-# platforms, we prepend #!$(INTERP)  -- SOF 6/97
-# 
-
-$(SCRIPT_PROG) :: $(SCRIPT_OBJS)
+$(SCRIPT_PROG) : $(SCRIPT_OBJS)
 	$(RM) $@
 	@echo Creating $@...
 ifeq "$(INTERP)" "perl"
@@ -636,36 +739,76 @@ endif
 ifneq "$(SCRIPT_PREFIX_FILES)" ""
 	@cat $(SCRIPT_PREFIX_FILES) >> $@
 endif
+ifneq "$(SCRIPT_SUBST)" ""
 	@eval $(SCRIPT_SUBST) 
+endif
 	@cat $(SCRIPT_OBJS) >> $@
 	@chmod a+x $@
 	@echo Done.
 endif
 
-# links to script programs: we sometimes install a script as
-# <name>-<version> with a link from <name> to the real script.
+# ---------------------------------------------------------------------------
+# Symbolic links
+
+# links to programs: we sometimes install a program as
+# <name>-<version> with a link from <name> to the real program.
+
+ifneq "$(LINK)" ""
+
+all :: $(LINK)
 
-ifneq "$(SCRIPT_LINK)" ""
-all :: $(SCRIPT_LINK)
+CLEAN_FILES += $(LINK)
+
+ifeq "$(LINK_TARGET)" ""
+ifneq "$(SCRIPT_PROG)" ""
+LINK_TARGET = $(SCRIPT_PROG)
+else
+ifneq "$(HS_PROG)" ""
+LINK_TARGET = $(HS_PROG)
+else
+ifneq "$(C_PROG)" ""
+LINK_TARGET = $(C_PROG)
+else
+LINK_TARGET = dunno
+endif
+endif
+endif
+endif
 
 #
-# Don't want to overwrite $(SCRIPT_LINK)s that aren't symbolic
+# Don't want to overwrite $(LINK)s that aren't symbolic
 # links. Testing for symbolic links is problematic to do in
 # a portable fashion using a /bin/sh test, so we simply rely
 # on perl.
 #
-$(SCRIPT_LINK) : $(SCRIPT_PROG)
-	@if ( $(PERL) -e '$$fn="$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
-	   echo "Creating a symbolic link from $(SCRIPT_PROG) to $(SCRIPT_LINK)"; \
-	   $(RM) $(SCRIPT_LINK); \
-	   $(LN_S) $(SCRIPT_PROG) $(SCRIPT_LINK); \
+$(LINK) : $(LINK_TARGET)
+	@if ( $(PERL) -e '$$fn="$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
+	   echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK)"; \
+	   $(RM) $(LINK); \
+	   $(LN_S) $(LINK_TARGET) $(LINK); \
 	 else \
-	   echo "Creating a symbolic link from $(SCRIPT_PROG) to $(SCRIPT_LINK) failed: \`$(SCRIPT_LINK)' already exists"; \
-	   echo "Perhaps remove \`$(SCRIPT_LINK)' manually?"; \
+	   echo "Creating a symbolic link from $(LINK_TARGET) to $(LINK) failed: \`$(LINK)' already exists"; \
+	   echo "Perhaps remove \`$(LINK)' manually?"; \
+	   exit 1; \
+	 fi;
+
+
+#
+# install links to script drivers.
+#
+install ::
+	@$(INSTALL_DIR) $(bindir)
+	@if ( $(PERL) -e '$$fn="$(bindir)/$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
+	   echo "Creating a symbol link from $(LINK_TARGET) to $(LINK) in $(bindir)"; \
+	   $(RM) $(bindir)/$(LINK); \
+	   $(LN_S) $(LINK_TARGET) $(bindir)/$(LINK); \
+	 else \
+	   echo "Creating a symbol link from $(LINK_TARGET) to $(LINK) in $(bindir) failed: \`$(bindir)/$(LINK)' already exists"; \
+	   echo "Perhaps remove \`$(bindir)/$(LINK)' manually?"; \
 	   exit 1; \
 	 fi;
-endif
 
+endif # LINK 
 
 
 ###########################################
@@ -714,6 +857,16 @@ install-dirs ::
 # within the various install targets instead.
 #install:: install-dirs
 
+# Install libraries automatically
+ifneq "$(LIBRARY)" ""
+INSTALL_LIBS  += $(LIBRARY)
+ifeq "$(DLLized)" "YES"
+INSTALL_PROGS += $(DLL_NAME)
+INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY))
+endif
+INSTALL_DATAS += $(HS_IFACES)
+endif
+
 ifneq "$(INSTALL_PROGS)" ""
 
 #
@@ -726,10 +879,10 @@ ifneq "$(INSTALL_PROGS)" ""
 # $(exeext).
 # 
 # This is bit of a pain to express since GNU make doesn't have
-# something like $(if ...), but possible using $(subst ..)
-# [Aside: I added support for $(if ..) to my local copy of GNU
+# something like $(if ...), but possible using $(subst ...)
+# [Aside: I added support for $(if ...) to my local copy of GNU
 # make at one stage, perhaps I should propagate the patch to
-# the GNU make maintainers..] 
+# the GNU make maintainers...] 
 #
 INSTALL_PROGS := $(foreach p, $(INSTALL_PROGS), $(addsuffix $(subst _,,$(subst __,$(exeext),_$(suffix $(p))_)), $(basename $(p))))
 
@@ -807,6 +960,14 @@ install:: $(INSTALL_DATAS)
 	done
 endif
 
+ifneq "$(INSTALL_INCLUDES)" ""
+install:: $(INSTALL_INCLUDES)
+	@$(INSTALL_DIR) $(includedir)
+	for i in $(INSTALL_INCLUDES); do \
+		$(INSTALL_DATA) $(INSTALL_OPTS) $$i $(includedir); \
+	done
+endif
+
 #
 # Use with care..
 #
@@ -844,107 +1005,11 @@ install-strip::
 	@$(MAKE) EXTRA_INSTALL_OPTS='-s' install                                	
 endif
 
+##############################################################################
 #
-# install links to script drivers.
-#
-ifneq "$(SCRIPT_LINK)" ""
-install ::
-	@if ( $(PERL) -e '$$fn="$(bindir)/$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
-	   echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK) in $(bindir)"; \
-	   $(RM) $(bindir)/$(SCRIPT_LINK); \
-	   $(LN_S) $(SCRIPT_PROG) $(bindir)/$(SCRIPT_LINK); \
-	 else \
-	   echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK) in $(bindir) failed: \`$(bindir)/$(SCRIPT_LINK)' already exists"; \
-	   echo "Perhaps remove \`$(bindir)/$(SCRIPT_LINK)' manually?"; \
-	   exit 1; \
-	 fi;
-
-endif
-
-###########################################
-#
-#	Targets: dist binary-dist
-#
-###########################################
-
-
-#
-# dist-pre is a canned rule the toplevel of your source tree
-# would use as follows, 
-#
-#  dist :: dist-pre
-#
-# it performs two tasks, first creating the distribution directory
-# tree and it then decorates the new tree with symbolic links pointing
-# to the symbolic links in the build tree.
-#
-# The dist-pre relies on (at least) the `find' in GNU findutils
-# (only tested with version 4.1). All non-GNU `find's I have
-# laid on my hands locally, has a restrictive treatment of {} in
-# -exec commands, i.e.,
-#
-#   find . -print echo a{} \;
-#   
-# does not expand the {}, it has to be a separate argument (i.e. `a {}').
-# GNU find is (IMHO) more sensible here, expanding any {} it comes across
-# inside an -exec, whether it is a separate arg or part of a word:
-#
-#  $ touch yes
-#  $ find --version
-#    GNU find version 4.1
-#  $ find yes -exec echo oh,{}! \;
-#    oh,yes!
-#
-# Of course, the above is not impossible to achieve with other finds,
-# just that GNU find does the Patently Right Thing here :)
-#
-# ====> if you're using these dist rules, get hold of GNU findutils.
-#
-#  --SOF 2/97
-#
-.PHONY: dist dist-pre dist-post
-
-#
-# The dist rules leaves out CVS, SRC (from mkshadowdir) and tests
-# directories when creating shadow source distrib tree
+#	Targets: check tags show
 #
-dist-pre::
-	-rm -rf $(SRC_DIST_DIR)
-	-rm -f $(SRC_DIST_NAME).tar.gz
-	(cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -name tests -prune -o -exec $(MKDIRHIER) $(SRC_DIST_DIR)/{} \; \) ; )
-	(cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) -name CVS -prune -o -name SRC -prune -o -name tests -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -type l -exec $(LN_S) $(FPTOOLS_TOP_ABS)/{} $(SRC_DIST_DIR)/{} \; )
-
-#
-# After having created a shadow distribution tree and copied/linked
-# all the necessary files to it, `dist-post' makes sure the permissions
-# are set right and then package up the tree. Empty directories are also removed.
-#
-# For now, we make the packaging a separate rule, so as to allow
-# the inspection of the dist tree before eventually packaging it up.
-#
-dist-post::
-	@echo Deleting the following empty directories..
-	( cd $(SRC_DIST_DIR) ; cd .. ; $(FIND) $(SRC_DIST_NAME) -type d -exec sh -c 'test x`ls $$0 | wc -l | sed -e "s/ //g"` = x0' {} \; -print -exec rm -rf {} \; -prune )
-	( cd $(SRC_DIST_DIR) ; cd .. ; chmod -R a+rw $(SRC_DIST_NAME) ) 
-
-# Automatic generation of a MANIFEST file for a source distribution
-# tree that is ready to go.
-dist-manifest ::
-	cd $(SRC_DIST_DIR); $(FIND) . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > /tmp/MANIFEST ; mv /tmp/MANIFEST MANIFEST
-
-dist-package:: dist-package-tar-gz
-
-dist-package-tar-gz ::
-	cd $(SRC_DIST_DIR); cd ..; $(TAR) chzf $(SRC_DIST_NAME).tar.gz $(SRC_DIST_NAME)
-
-dist-package-zip ::
-	cd $(SRC_DIST_DIR); cd ..; $(ZIP) $(ZIP_OPTS) -r $(SRC_DIST_NAME).zip $(SRC_DIST_NAME)
-
-###########################################
-#
-#	Targets: check tags show info
-#
-###########################################
+##############################################################################
 
 #------------------------------------------------------------
 # 			Check
@@ -982,11 +1047,14 @@ endif
 #
 
 show:
-	@echo '$(VALUE)=$($(VALUE))'
+	@echo '$(VALUE)="$($(VALUE))"'
 
-#--------------------------------------------------------------------------
-# SGML Documentation
+################################################################################
+#
+#			SGML Documentation
 #
+################################################################################
+
 .PHONY: dvi ps html pdf rtf
 
 ifneq "$(SGML_DOC)" ""
@@ -994,28 +1062,20 @@ ifneq "$(SGML_DOC)" ""
 # multi-file SGML document: main document name is specified in $(SGML_DOC),
 # sub-documents (.sgml files) listed in $(SGML_SRCS).
 
-ifeq "$(VSGML_SRCS)" ""
-VSGML_SRCS = $(wildcard *.vsgml)
-endif
-
 ifeq "$(SGML_SRCS)" ""
-ifneq "$(VSGML_SRCS)" ""
-SGML_SRCS = $(patsubst %.vsgml, %.sgml, $(VSGML_SRCS))
-else
 SGML_SRCS = $(wildcard *.sgml)
 endif
-endif
 
-SGML_TEX  = $(SGML_DOC).tex
-SGML_DVI  = $(SGML_DOC).dvi
-SGML_PS   = $(SGML_DOC).ps
-SGML_PDF  = $(SGML_DOC).pdf
-SGML_RTF  = $(SGML_DOC).rtf
-SGML_HTML = $(SGML_DOC).html
+SGML_TEX  = $(addsuffix .tex,$(SGML_DOC))
+SGML_DVI  = $(addsuffix .dvi,$(SGML_DOC))
+SGML_PS   = $(addsuffix .ps,$(SGML_DOC))
+SGML_PDF  = $(addsuffix .pdf,$(SGML_DOC))
+SGML_RTF  = $(addsuffix .rtf,$(SGML_DOC))
+SGML_HTML = $(addsuffix .html,$(SGML_DOC))
 # HTML output goes in a subdirectory on its own.
-SGML_TEXT = $(SGML_DOC).txt
+SGML_TEXT = $(addsuffix .txt,$(SGML_DOC))
 
-$(SGML_DVI) $(SGML_PS) $(SGML_INFO) $(SGML_HTML) $(SGML_TEXT) :: $(SGML_SRCS)
+$(SGML_DVI) $(SGML_PS) $(SGML_HTML) $(SGML_TEXT) $(SGML_PDF) :: $(SGML_SRCS)
 
 dvi  :: $(SGML_DVI)
 ps   :: $(SGML_PS)
@@ -1026,69 +1086,47 @@ txt  :: $(SGML_TEXT)
 
 CLEAN_FILES += $(SGML_TEXT) $(SGML_TEX) $(SGML_PS) $(SGML_DVI) $(SGML_PDF) $(SGML_RTF) $(SGML_HTML) $(SGML_DOC)-*.html
 # can't use $(SGML_SRCS) here, it was maybe used elsewhere
-MOSTLY_CLEAN_FILES += $(patsubst %.vsgml, %.sgml, $(VSGML_SRCS))
 
-clean ::
+extraclean ::
+	$(RM) -rf DBTOHTML_OUTPUT_*
+	$(RM) -rf *.junk/
 	$(RM) -rf $(SGML_DOC)
-
 endif
 
-###########################################
+##############################################################################
 #
 #	Targets: clean
 #
-###########################################
-
-.PHONY: realclean mostlyclean clean distclean maintainer-clean
+##############################################################################
 
-# realclean is just a synonym for maintainer-clean
-realclean: maintainer-clean
+# we have to be careful about recursion here; since all the clean
+# targets are recursive, we don't want to make eg. distclean depend on
+# clean because that would result in far too many recursive calls.
 
+.PHONY: mostlyclean clean distclean maintainer-clean
 
-ifneq "$(MOSTLY_CLEAN_FILES)" ""
 mostlyclean::
 	rm -f $(MOSTLY_CLEAN_FILES)
-endif
 
-ifneq "$(CLEAN_FILES)" ""
-clean:: mostlyclean
-	rm -f $(CLEAN_FILES)
-endif
+# extraclean is used for adding actions to the clean target.
+extraclean::
 
+clean:: extraclean
+	rm -f $(MOSTLY_CLEAN_FILES) $(CLEAN_FILES)
 
-ifneq "$(DIST_CLEAN_FILES)" ""
-distclean:: mostlyclean clean
-	rm -f $(DIST_CLEAN_FILES)
-endif
-
+distclean:: extraclean
+	rm -f $(MOSTLY_CLEAN_FILES) $(CLEAN_FILES) $(DIST_CLEAN_FILES)
 
-ifneq "$(MAINTAINER_CLEAN_FILES)" ""
-maintainer-clean:: mostlyclean clean distclean
+maintainer-clean:: extraclean
 	@echo 'This command is intended for maintainers to use; it'
 	@echo 'deletes files that may need special tools to rebuild.'
-	rm -f $(MAINTAINER_CLEAN_FILES)
-endif
-
-#
-# If (Haskell) object files are split, cleaning up 
-# consist of descending into the directories where
-# the myriads of object files have been put.
-#
-
-ifneq "$(HS_OBJS)" ""
-ifneq "$(filter -split-objs,$(HC_OPTS))" ""
-clean ::
-	$(FIND) $(patsubst %.$(way_)o,%,$(HS_OBJS)) -name '*.$(way_)o' -print | xargs $(RM) __rm_food
-	-rmdir $(patsubst %.$(way_)o,%,$(HS_OBJS)) > /dev/null 2>&1
-endif
-endif
-
+	rm -f $(MOSTLY_CLEAN_FILES) $(CLEAN_FILES) $(DIST_CLEAN_FILES) $(MAINTAINER_CLEAN_FILES)
 
-#################################################################################
+################################################################################
 #
 #			Way management
 #
-#################################################################################
+################################################################################
 
 # Here is the ingenious jiggery pokery that allows you to build multiple versions
 # of a program in a single build tree.
@@ -1142,3 +1180,42 @@ $(LIB_WAY_TARGETS) :
 	$(MAKE) $(MFLAGS) $@ way=$(subst .,,$(suffix $(subst _,.,$(basename $@))))
 
 endif	# if way
+
+# -------------------------------------------------------------------------
+# Object and interface files have suffixes tagged with their ways
+
+ifneq "$(way)" ""
+SRC_HC_OPTS += -hisuf $(way_)hi -hcsuf $(way_)hc -osuf $(way_)o
+endif
+
+# -------------------------------------------------------------------------
+# Rules to invoke the current target recursively for each way
+
+ifneq "$(WAYS)" ""
+ifeq "$(way)" ""
+
+# NB: the targets exclude 
+#	boot runtests
+# since these are way-independent
+all docs TAGS clean distclean mostlyclean maintainer-clean install ::
+	@echo "------------------------------------------------------------------------"
+	@echo "===fptools== Recursively making \`$@' for ways: $(WAYS) ..."
+	@echo "PWD = $(shell pwd)"
+	@echo "------------------------------------------------------------------------"
+# Don't rely on -e working, instead we check exit return codes from sub-makes.
+	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
+	for i in $(WAYS) ; do \
+	  echo "------------------------------------------------------------------------"; \
+	  echo "==fptools== $(MAKE) way=$$i $@;"; \
+	  echo "PWD = $(shell pwd)"; \
+	  echo "------------------------------------------------------------------------"; \
+	  $(MAKE) way=$$i --no-print-directory $(MFLAGS) $@ ; \
+	  if [ $$? -eq 0 ] ; then true; else exit $$x_on_err; fi; \
+	done
+	@echo "------------------------------------------------------------------------"
+	@echo "===fptools== Finished recursively making \`$@' for ways: $(WAYS) ..."
+	@echo "PWD = $(shell pwd)"
+	@echo "------------------------------------------------------------------------"
+
+endif
+endif