allow build settings to be overriden by adding mk/validate.mk

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 8e9d55d..b3f9808 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -35,8 +35,8 @@ default_target: all
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = base old-locale old-time directory process filepath pretty \
-          template-haskell readline Cabal random haskell98
+SUBDIRS = base old-locale old-time filepath directory process pretty \
+          hpc template-haskell readline Cabal random haskell98
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -61,7 +61,6 @@ SUBDIRS += $(wildcard mtl)
 SUBDIRS += $(wildcard fgl)
 SUBDIRS += $(wildcard X11)
 SUBDIRS += $(wildcard time)
-SUBDIRS += $(wildcard hpc)
 ifeq "$(Windows)" "NO"
 # HGL is not working on Win32, so omit it for now.  Better not to ship it
 # at all than to ship a broken version.
@@ -273,6 +272,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
        $(RM) -f stamp/bootstrapping.*
        $(RM) -rf bootstrapping.*
        $(RM) -rf ifBuildable
+       $(RM) -rf installPackage
        $(RM) -f libraries.txt index.html doc-index.html
 
 $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \