X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2FMakefile;h=27144d018744b447ed687df3dc156089d74c6b05;hb=6c01550d031fb7c96efa368f241c3291811f208e;hp=ea0a08c431317c877ff2997145991150f7ab48f3;hpb=dfa0e964ff6a5eae3d6fc4de5613be7fb4c6176d;p=ghc-hetmet.git

diff --git a/ghc/lib/Makefile b/ghc/lib/Makefile
index ea0a08c..27144d0 100644
--- a/ghc/lib/Makefile
+++ b/ghc/lib/Makefile
@@ -10,101 +10,8 @@
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
-ifeq "$(way)" ""
-SUBDIRS = cbits
-ifeq ($(IncludeTestDirsInBuild),YES)
-  SUBDIRS += tests
-endif
-else
-SUBDIRS=
-endif
+# posix must be before misc.
 
-#-----------------------------------------------------------------------------
-# 	Setting the standard variables
-#
-
-LIB_DIRS = ghc required glaExts concurrent
-
-LIBRARY = libHS$(_way).a
-HS_SRCS	= $(foreach d, $(LIB_DIRS), $(wildcard $(d)/*.lhs))
-HS_OBJS = $(HS_SRCS:.lhs=.$(way_)o)
-LIBOBJS = $(HS_OBJS)
-HS_IFACES= $(HS_SRCS:.lhs=.$(way_)hi) ghc/GHC.$(way_)hi
-
-#-----------------------------------------------------------------------------
-# 	Setting the GHC compile options
-
-SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts)
-
-#
-# Profiling options
-WAY_p_HC_OPTS += -prof -GPrelude
-WAY_mr_HC_OPTS += -prof -GPrelude
-
-#
-# Object and interface files have suffixes tagged with their ways
-#
-ifneq "$(way)" ""
-SRC_HC_OPTS += -hisuf $(way_)hi
-endif
-
-# per-module flags
-
-glaExts/PackedString_HC_OPTS += -monly-3-regs
-required/Directory_HC_OPTS   += -monly-3-regs 
-concurrent/Parallel_HC_OPTS  += -fglasgow-exts
-required/Time_HC_OPTS        += -monly-3-regs -H10m
-
-# Far too much heap is needed to compile PrelNum with -O at the
-# moment, but there you go..
-ghc/PrelNum_HC_OPTS          += -H30m
-# Note: this option has to go in the Makefile rather than in an
-# OPTIONS line in the source file. The reason being that we want
-# to override the SRC_HC_OPTS of -O, and anything option coming
-# from the Makefile overrides what's in OPTIONS lines. (mumble_HC_OPTS
-# does override SRC_HC_OPTS settings)
-ghc/UnsafeST_HC_OPTS         += -Onot
-
-ghc/PrelBase_HC_OPTS         += -H8m
-ghc/PrelRead_HC_OPTS         += -H8m
-ghc/IOHandle_HC_OPTS         += -H8m
-
-#-----------------------------------------------------------------------------
-# 	Dependency generation
-
-SRC_MKDEPENDHS_OPTS += -ighc:required:glaExts:concurrent -I$(GHC_INCLUDE_DIR)
-
-#-----------------------------------------------------------------------------
-# 	Rules
-
-GHC.$(way_)hi	: GHC.hi-boot
-	cp GHC.hi-boot GHC.$(way_)hi
-
-
-
-#-----------------------------------------------------------------------------
-# 	Installation; need to install .hi files as well as libraries
-#
-# The interface files are put inside the $(libdir), since they
-# might (potentially) be platform specific..
-#
-# Note: we use `override' here to ignore the setting of datadir
-# which may have been set on the command-line..naughty, as it
-# prevents `datadir' from being used from the command-line.
-# This only applies to binary-distributions, though.n
-
-ifeq "$(BIN_DIST)" "1"
-override datadir:=$(libdir)/imports
-else
-datadir:=$(libdir)/imports
-endif
-
-#
-# Files to install from here
-# 
-INSTALL_LIBS  += $(LIBRARY)
-INSTALL_DATAS += $(HS_IFACES)
+SUBDIRS = std exts posix misc concurrent
 
 include $(TOP)/mk/target.mk
-
-