Eq and Ord have moved into GHC.Classes

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index f78948c..5c5d192 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -39,6 +39,8 @@ TOP=..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/cabal-flags.mk
 
+# Any libraries listed here should also be in ../packages
+
 SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base array packedstring
 SUBDIRS += containers bytestring old-locale old-time filepath directory
 ifeq "$(GhcLibsWithUnix)" "YES"
@@ -65,9 +67,7 @@ SUBDIRS += $(wildcard mtl)
 SUBDIRS += $(wildcard time)
 SUBDIRS += $(wildcard stm)
 SUBDIRS += $(wildcard xhtml)
-SUBDIRS += $(wildcard cgi)
 SUBDIRS += $(wildcard parallel)
-SUBDIRS_BUILD += $(wildcard ndp)
 SUBDIRS_BUILD += $(wildcard dph/dph-base)
 SUBDIRS_BUILD += $(wildcard dph/dph-prim-interface)
 SUBDIRS_BUILD += $(wildcard dph/dph-prim-seq)
@@ -129,7 +129,7 @@ CONFIGURE_OPTS += --enable-library-profiling
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling
 endif
 
-ifneq "$(findstring $(space)dyn$(space), $(space)$(GhcLibWays)$(space))" ""
+ifeq "$(BuildSharedLibs)" "YES"
 CONFIGURE_OPTS += --enable-shared
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared
 endif
@@ -146,7 +146,7 @@ subdirs:
 
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
-IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages
+IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages
 
 CABAL_GHC_FLAGS = -Wall
 ifeq "$(ghc_ge_605)" "NO"
@@ -163,6 +163,7 @@ BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir
 boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf
 
 cabal-bin: cabal-bin.hs
+       mkdir $(HERE_ABS)/bootstrapping
        $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin
 
 bootstrapping.conf: cabal-bin
@@ -311,7 +312,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
        -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping
        -cd Cabal    && $(CABAL) clean --distpref=dist-bootstrapping
        -cd hpc      && $(CABAL) clean --distpref=dist-bootstrapping
-       $(RM) -rf bootstrapping/*
+       $(RM) -rfd bootstrapping
        $(RM) -f bootstrapping.conf     bootstrapping.conf.old
        $(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old
        $(RM) -f cabal-bin cabal-bin.exe