X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=2d68868ede41a2fc93735e62b96a60c8aff1bb09;hb=39271273d6b1fd2cdfe92be1fa30a7eec3cc9107;hp=062399ae9e3575b32683e99a0d9f6c1305823d02;hpb=e1ca71716cd40aecf23f572e661e0285dd1b8b3a;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 062399a..2d68868 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -42,14 +42,14 @@ include $(TOP)/mk/cabal-flags.mk # Any libraries listed here should also be in ../packages SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base base3-compat array packedstring -SUBDIRS += containers bytestring old-locale old-time filepath directory +SUBDIRS += containers bytestring old-locale old-time filepath ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix endif ifeq "$(Windows)" "YES" SUBDIRS += $(wildcard Win32) endif -SUBDIRS += process pretty hpc template-haskell editline Cabal random haskell98 +SUBDIRS += directory process pretty hpc template-haskell editline Cabal random haskell98 # Set GhcBootLibs=YES from the command line to work with just the libraries # needed to bootstrap GHC. @@ -232,14 +232,12 @@ ALL_CONFIGURE_FLAGS = \ $(CONFIGURE_OPTS) stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-par: \ - create_dph-par + dph/dph-par stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-seq: \ - create_dph-seq + dph/dph-seq -.PHONY: dph-create_par create_dph-seq - -create_dph-par create_dph-seq: create_%: +dph/%: $(MAKE) -C dph $* $(foreach SUBDIR,$(SUBDIRS), \