X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=618916e5102b123ff3d8cc65405ff10ea39fa9ea;hb=29e342d1903ba4cb4b58a66605f00920eddae7a5;hp=3a1c70ffa64837ecdbd54747a240cbcaeb02bbac;hpb=291acff508eccd0a2ad510d48114bf3f8987c7db;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 3a1c70f..618916e 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -9,11 +9,14 @@ include $(TOP)/mk/boilerplate.mk # want the Makefile. MFLAGS += -f Makefile -SUBDIRS = base haskell98 template-haskell +SUBDIRS = base haskell98 template-haskell readline ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix endif +ifeq "$(Windows)" "YES" +SUBDIRS += $(wildcard Win32) +endif SUBDIRS += Cabal @@ -22,16 +25,13 @@ SUBDIRS += Cabal ifneq "$(GhcBootLibs)" "YES" SUBDIRS += $(wildcard parsec) SUBDIRS += $(wildcard haskell-src) -SUBDIRS += $(wildcard time) SUBDIRS += $(wildcard network) SUBDIRS += $(wildcard QuickCheck) 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) @@ -43,10 +43,6 @@ SUBDIRS += $(wildcard ObjectIO) endif endif -ifeq "$(GhcLibsWithReadline)" "YES" -SUBDIRS += $(wildcard readline) -endif - # ----------------------------------------------------------------------------- DIST_CLEAN_FILES += config.cache config.status