summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorSimon Marlow <simonmar@microsoft.com>2006-04-07 02:05:11 +0000
committerSimon Marlow <simonmar@microsoft.com>2006-04-07 02:05:11 +0000
commit0065d5ab628975892cea1ec7303f968c3338cbe1 (patch)
tree8e2afe0ab48ee33cf95009809d67c9649573ef92 /libraries
parent28a464a75e14cece5db40f2765a29348273ff2d2 (diff)
downloadhaskell-0065d5ab628975892cea1ec7303f968c3338cbe1.tar.gz
Reorganisation of the source tree
Most of the other users of the fptools build system have migrated to Cabal, and with the move to darcs we can now flatten the source tree without losing history, so here goes. The main change is that the ghc/ subdir is gone, and most of what it contained is now at the top level. The build system now makes no pretense at being multi-project, it is just the GHC build system. No doubt this will break many things, and there will be a period of instability while we fix the dependencies. A straightforward build should work, but I haven't yet fixed binary/source distributions. Changes to the Building Guide will follow, too.
Diffstat (limited to 'libraries')
-rw-r--r--libraries/mk/boilerplate.mk11
1 files changed, 0 insertions, 11 deletions
diff --git a/libraries/mk/boilerplate.mk b/libraries/mk/boilerplate.mk
index a9c22bcf74..3f15f8d297 100644
--- a/libraries/mk/boilerplate.mk
+++ b/libraries/mk/boilerplate.mk
@@ -1,6 +1,3 @@
-# -----------------------------------------------------------------------------
-# $Id: boilerplate.mk,v 1.1 2001/07/31 16:40:34 simonmar Exp $
-
# Begin by slurping in the boilerplate from one level up.
# Remember, TOP is the top level of the innermost level
# (FPTOOLS_TOP is the fptools top)
@@ -11,12 +8,6 @@
LIBRARIES_TOP := $(TOP)
TOP:=$(TOP)/..
-# Also set GHC_TOP here, because we need to get at bits of GHC's config
-GHC_TOP := $(TOP)/ghc
-
-# Pull in GHC's version & project info
--include $(GHC_TOP)/mk/version.mk
-
# Pull in the fptools boilerplate
include $(TOP)/mk/boilerplate.mk
@@ -27,8 +18,6 @@ TOP:=$(LIBRARIES_TOP)
# Everything after this point
# augments or overrides previously set variables.
--include $(GHC_TOP)/mk/paths.mk
-
-include $(TOP)/mk/paths.mk
-include $(TOP)/mk/opts.mk
-include $(TOP)/mk/suffix.mk