Reorganisation of the source tree

[ghc-hetmet.git] / mk / paths.mk

diff --git a/mk/paths.mk b/mk/paths.mk
index 5c88a62..b616e7d 100644 (file)
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -1,73 +1,17 @@
-#################################################################################
+################################################################################
 #
 #                          paths.mk
 #
 #      This file defines Make variables for standard directories
 #      and file lists
 #
-#################################################################################
+################################################################################
 
-
-#-----------------------------------------------------------------
-#
-# Installation setup
-#
-
-#-----------------------------------------------------------------------------
-# install configuration
-#
-# The install standard target is guided by the following four variables
-#
-#  INSTALL_PROGS    (installed in $(bindir))
-#  INSTALL_LIBS     (installed in $(libdir))
-#  INSTALL_LIBEXECS (installed in $(libexecdir))
-#  INSTALL_DATAS    (installed in $(datadir))
-#  INSTALL_IFACES   (installed in $(ifacedir))
-#
-# see target.mk for more information.
-#
-
-#
-# Setting user/group ownership for the installed entities
-#
-# this stuff about "who" does the installing doesn't have make vars
-# as it is not intended to be run-time changeable.
-#
-ifneq "$(OWNER)" ""
-INSTALL_OWNER  = -o $(OWNER)
-else
-INSTALL_OWNER  =
-endif
-
-ifneq "$(GROUP)" ""
-INSTALL_GROUP  = -g $(GROUP)
-else
-INSTALL_GROUP  =
-endif
-
-SRC_INSTALL_OPTS += $(INSTALL_OWNER) $(INSTALL_GROUP)
-
-#
-# Invocations of `install' for the four different classes
-# of targets:
-#
-
-INSTALL_PROGRAM = $(INSTALL) -m 755
-INSTALL_SCRIPT  = $(INSTALL) -m 755
-INSTALL_SHLIB   = $(INSTALL) -m 755
-INSTALL_DATA    = $(INSTALL) -m 644
-INSTALL_DIR     = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier
-
-#
-# The install variables does not have any defaults,
-# what files to install have to be specified in the Makefiles.
-#
-
-#################################################################################
+################################################################################
 #
 #              Standard variable names
 #
-#################################################################################
+################################################################################
 # The fptools mk setup defines a set of standard names which are used
 # by the standard targets provided by mk. One example of this is the
 # use of standard names for specifying what files to compile, their
@@ -109,6 +53,8 @@ INSTALL_DIR     = $(FPTOOLS_TOP)/glafp-utils/mkdirhier/mkdirhier
 ALL_SRCS    = $(wildcard $(patsubst ./%, %,  \
                   $(patsubst %,%/*.hs,   . $(ALL_DIRS)) \
                   $(patsubst %,%/*.lhs,  . $(ALL_DIRS)) \
+                  $(patsubst %,%/*.hs-boot,  . $(ALL_DIRS)) \
+                  $(patsubst %,%/*.lhs-boot, . $(ALL_DIRS)) \
                   $(patsubst %,%/*.y,    . $(ALL_DIRS)) \
                   $(patsubst %,%/*.ly,   . $(ALL_DIRS)) \
                   $(patsubst %,%/*.x,    . $(ALL_DIRS)) \
@@ -132,6 +78,9 @@ ALL_SRCS    = $(wildcard $(patsubst ./%, %,  \
 PRE_HS_SRCS  = $(filter %.hs,  $(PRE_SRCS))
 PRE_LHS_SRCS = $(filter %.lhs, $(PRE_SRCS))
 
+PRE_HS_BOOT_SRCS = $(filter %.hs-boot,  $(PRE_SRCS)) \
+                  $(filter %.lhs-boot, $(PRE_SRCS))
+
 GC_SRCS       = $(filter %.gc,  $(PRE_SRCS))
 HSC_SRCS      = $(filter %.hsc, $(PRE_SRCS))
 HAPPY_Y_SRCS  = $(filter %.y,   $(PRE_SRCS))
@@ -197,6 +146,12 @@ HS_SRCS        = $(filter %.lhs %.hs, $(sort $(SRCS) $(BOOT_SRCS)))
 HS_OBJS     = $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))
 HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_SRCS)))
 
+HI_BOOTS    = $(patsubst %.hs-boot, %.$(way_)hi-boot, \
+             $(patsubst %.lhs-boot, %.$(way_)hi-boot, $(PRE_HS_BOOT_SRCS)))
+
+O_BOOTS     = $(patsubst %.hs-boot, %.$(way_)o-boot, \
+             $(patsubst %.lhs-boot, %.$(way_)o-boot, $(PRE_HS_BOOT_SRCS)))
+
 GC_C_OBJS   = $(addsuffix _stub_ffi.$(way_)o,$(basename $(filter %.gc,$(SRCS))))
 HSC_C_OBJS  = $(addsuffix _hsc.$(way_)o,$(basename $(filter %.hsc,$(SRCS))))
 
@@ -212,7 +167,7 @@ endif
 # These are droppings from hsc2hs - ignore them if we see them.
 EXCLUDED_C_SRCS += $(patsubst %.hsc, %_hsc_make.c, $(HSC_SRCS))
 
-C_SRCS      = $(filter-out $(EXCLUDED_C_SRCS),$(filter %.c,$(SRCS)))
+C_SRCS      = $(filter-out $(EXCLUDED_C_SRCS),$(filter %.c %.S,$(SRCS)))
 C_OBJS      = $(addsuffix .$(way_)o,$(basename $(C_SRCS)))
 
 # SCRIPT_SRCS:  list of raw script files (in literate form)
@@ -275,14 +230,15 @@ TAGS_C_SRCS=$(C_SRCS)
 #
 # NOTE: $(SCRIPT_OBJS) is not in MOSTLY_CLEAN_FILES, because in some
 # places in the tree it appears that we have source files in $(SCRIPT_OBJS).
-# Specifically glafp-utils/mkdependC/mkdependC.prl and others in ghc/driver and
+# Specifically glafp-utils/mkdependC/mkdependC.prl and others in driver/ and
 # possibly others elsewhere in the tree.  ToDo: fix this properly.
 MOSTLY_CLEAN_FILES += $(HS_OBJS) $(C_OBJS) $(HSC_C_OBJS) $(GC_C_OBJS)
 CLEAN_FILES        += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) \
                      $(PROG) $(LIBRARY) a.out \
                      $(DERIVED_HSC_SRCS) \
                      $(DERIVED_GC_SRCS) \
-                     $(patsubst %,%/*.$(way_)hi, . $(ALL_DIRS))
+                     $(patsubst %,%/*.$(way_)hi, . $(ALL_DIRS)) \
+                     $(HI_BOOTS) $(O_BOOTS)
 
 # we delete *all* the .hi files we can find, rather than just
 # $(HS_IFACES), because stale interfaces left around by modules which
@@ -352,5 +308,9 @@ SRC_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
 DLL_PEN = $(FPTOOLS_TOP)/dll
 
 #------------------------------------------------------------------
+#
+# Stylesheet for HTML generated from DocBook XML
+#
 
-FPTOOLS_CSS = $(FPTOOLS_TOP)/mk/fptools.css
+FPTOOLS_CSS     = fptools.css
+FPTOOLS_CSS_ABS = $(FPTOOLS_TOP)/mk/$(FPTOOLS_CSS)