remove empty dir

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

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 5012d8a..2e86122 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,68 +1,80 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.34 2001/06/27 13:16:59 rrt Exp $
+# $Id: paths.mk,v 1.44 2004/11/11 09:36:40 simonmar Exp $
 #
 # ghc project specific make variables
 #
 
-#-----------------------------------------------------------------------------
-# HsTags
-
-ifdef UseInstalledUtils
-HSTAGS                 = hstags
-else
-HSTAGS                 = $(HSTAGS_DIR)/hstags
-HSTAGS_DIR             = $(GHC_UTILS_DIR)/hstags
-endif
+PROJECT_DIR            := ghc
 
 #-----------------------------------------------------------------------------
-# Extra things ``only for'' for the ghc project
-#      These are all build-time things
-
-GHC_INCLUDE_DIR        := $(TOP)/includes
-GHC_COMPILER_DIR       := $(TOP)/compiler
-GHC_RUNTIME_DIR        := $(TOP)/rts
-GHC_LIB_DIR            := $(TOP)/lib
-GHC_INTERPRETER_DIR    := $(TOP)/interpreter
-
-# ---------------------------------------------------
-# -- These variables are defined primarily so they can 
-# -- be spat into Config.hs by ghc/compiler/Makefile
+# Useful directories
 #
-# -- See comments in ghc/compiler/main/SysTools.lhs 
-
-
-PROJECT_DIR            := ghc
-GHC_DRIVER_DIR         := $(PROJECT_DIR)/driver
-GHC_UTILS_DIR          := $(PROJECT_DIR)/utils
-
-GHC_TOUCHY_DIR                 = $(GHC_UTILS_DIR)/touchy
+#      xxx_DIR_REL      a directory relative to $(GHC_TOP)
+#      xxx_DIR          a directory (including $(GHC_TOP))
+
+GHC_INCLUDE_DIR_REL    = includes
+GHC_COMPILER_DIR_REL   = compiler
+GHC_RUNTIME_DIR_REL    = rts
+GHC_UTILS_DIR_REL      = utils
+GHC_DRIVER_DIR_REL     = driver
+GHC_LIB_DIR_REL                = lib
+
+GHC_UNLIT_DIR_REL      = $(GHC_UTILS_DIR_REL)/unlit
+GHC_HSTAGS_DIR_REL     = $(GHC_UTILS_DIR_REL)/hasktags
+GHC_TOUCHY_DIR_REL     = $(GHC_UTILS_DIR_REL)/touchy
+GHC_PKG_DIR_REL                = $(GHC_UTILS_DIR_REL)/ghc-pkg
+GHC_GENPRIMOP_DIR_REL  = $(GHC_UTILS_DIR_REL)/genprimopcode
+GHC_GENAPPLY_DIR_REL   = $(GHC_UTILS_DIR_REL)/genapply
+GHC_MANGLER_DIR_REL    = $(GHC_DRIVER_DIR_REL)/mangler
+GHC_SPLIT_DIR_REL      = $(GHC_DRIVER_DIR_REL)/split
+GHC_SYSMAN_DIR_REL     = $(GHC_RUNTIME_DIR_REL)/parallel
+GHC_LIB_COMPAT_DIR_REL = $(GHC_LIB_DIR_REL)/compat
+
+GHC_INCLUDE_DIR        = $(GHC_TOP)/$(GHC_INCLUDE_DIR_REL)
+GHC_COMPILER_DIR       = $(GHC_TOP)/$(GHC_COMPILER_DIR_REL)
+GHC_RUNTIME_DIR        = $(GHC_TOP)/$(GHC_RUNTIME_DIR_REL)
+GHC_UTILS_DIR          = $(GHC_TOP)/$(GHC_UTILS_DIR_REL)
+GHC_DRIVER_DIR         = $(GHC_TOP)/$(GHC_DRIVER_DIR_REL)
+GHC_PKG_DIR            = $(GHC_TOP)/$(GHC_PKG_DIR_REL)
+GHC_GENPRIMOP_DIR      = $(GHC_TOP)/$(GHC_GENPRIMOP_DIR_REL)
+GHC_GENAPPLY_DIR       = $(GHC_TOP)/$(GHC_GENAPPLY_DIR_REL)
+GHC_MANGLER_DIR         = $(GHC_TOP)/$(GHC_MANGLER_DIR_REL)
+GHC_SPLIT_DIR           = $(GHC_TOP)/$(GHC_SPLIT_DIR_REL)
+GHC_LIB_COMPAT_DIR      = $(GHC_TOP)/$(GHC_LIB_COMPAT_DIR_REL)
 
-GHC_UNLIT_DIR          = $(GHC_UTILS_DIR)/unlit
-GHC_UNLIT              = unlit$(EXE_SUFFIX)
-
-GHC_MANGLER_DIR        = $(GHC_DRIVER_DIR)/mangler
-GHC_MANGLER            = ghc-asm
-
-GHC_SPLIT_DIR          = $(GHC_DRIVER_DIR)/split
-GHC_SPLIT              = ghc-split
+# -----------------------------------------------------------------------------
+# Names of programs in the GHC tree
+#
+#      xxx_PGM         the name of an executable, without the path
+
+GHC_UNLIT_PGM          = unlit$(exeext)
+GHC_HSTAGS_PGM         = hasktags
+GHC_TOUCHY_PGM         = touchy$(exeext)
+GHC_MANGLER_PGM                = ghc-asm
+GHC_SPLIT_PGM          = ghc-split
+GHC_SYSMAN_PGM                 = SysMan
+GHC_PKG_INPLACE_PGM    = ghc-pkg-inplace
+GHC_GENPRIMOP_PGM      = genprimopcode
+GHC_GENAPPLY_PGM       = genapply
 
-GHC_SYSMAN             = $(GHC_RUNTIME_DIR)/parallel/SysMan
-GHC_SYSMAN_DIR                 = $(GHC_RUNTIME_DIR)/parallel
+# -----------------------------------------------------------------------------
+# Auxilliary programs used by GHC
+#
+#      xxx              the pathname to an executable (some using $(TOP))
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-
 GHC_CP                 = "xcopy /y"
 GHC_PERL               = perl
-GHC_TOUCHY             = touchy$(EXE_SUFFIX)
-GHC_RAWCPP             = $(subst -mwin32,,$(RAWCPP))
-#      Don't know why we do this...
-
 else
-
 GHC_CP                 = $(CP)
 GHC_PERL               = $(PERL)
-GHC_TOUCHY             = touch
-GHC_RAWCPP             = $(RAWCPP)
-
 endif
 
+GHC_UNLIT              = $(GHC_UNLIT_DIR)/$(GHC_UNLIT_PGM)
+GHC_HSTAGS             = $(GHC_HSTAGS_DIR)/$(GHC_HSTAGS_PGM)
+GHC_MANGLER            = $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM)
+GHC_SPLIT              = $(GHC_SPLIT_DIR)/$(GHC_SPLIT_PGM)
+GHC_SYSMAN             = $(GHC_SYSMAN_DIR)/$(GHC_SYSMAN_PGM)
+GHC_PKG_INPLACE                = $(GHC_PKG_DIR)/$(GHC_PKG_INPLACE_PGM)
+GHC_GENPRIMOP          = $(GHC_GENPRIMOP_DIR)/$(GHC_GENPRIMOP_PGM)
+GHC_GENAPPLY           = $(GHC_GENAPPLY_DIR)/$(GHC_GENAPPLY_PGM)