X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=cc4ee0f93545e02cd543bf97c6b6c3414ab5e665;hb=62e4230b4597192b6b47cde72ecd8629a370b4ee;hp=a27d92b79e8fafe55fac5fe1cc45039c0f6e8ac3;hpb=8c56903f4884d9597e04868e1a67513e63dc89c0;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index a27d92b..cc4ee0f 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -5,18 +5,25 @@ include $(TOP)/mk/boilerplate.mk
 
 # -----------------------------------------------------------------------------
 
+# The Cabal package has a GNUmakefile for standalone building, but we
+# want the Makefile.
+MFLAGS += -f Makefile
+
 SUBDIRS = base haskell98 template-haskell
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
 endif
+ifeq "$(Windows)" "YES"
+SUBDIRS += $(wildcard Win32)
+endif
 
 SUBDIRS += Cabal
-SUBDIRS += $(wildcard parsec)
 
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
 ifneq "$(GhcBootLibs)" "YES"
+SUBDIRS += $(wildcard parsec)
 SUBDIRS += $(wildcard haskell-src)
 SUBDIRS += $(wildcard network)
 SUBDIRS += $(wildcard QuickCheck)
@@ -24,9 +31,7 @@ SUBDIRS += $(wildcard HUnit)
 SUBDIRS += $(wildcard mtl)
 SUBDIRS += $(wildcard fgl)
 SUBDIRS += $(wildcard X11)
-ifeq "$(Windows)" "YES"
-SUBDIRS += $(wildcard Win32)
-endif
+SUBDIRS += $(wildcard time)
 SUBDIRS += $(wildcard HGL)
 SUBDIRS += $(wildcard OpenGL)
 SUBDIRS += $(wildcard GLUT)