projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(F)SLIT -> (f)sLit in TcSplice
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
5af0f7e
..
53a13e6
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-12,7
+12,7
@@
#
# or the following is equivalent:
#
#
# or the following is equivalent:
#
-# make rebuild.library.<package>
+# make remake.library.<package>
#
# To add a new library to the tree, do
#
#
# To add a new library to the tree, do
#
@@
-38,15
+38,15
@@
show:
TOP=..
include $(TOP)/mk/boilerplate.mk
TOP=..
include $(TOP)/mk/boilerplate.mk
-SUBDIRS = base array packedstring containers bytestring
-SUBDIRS += old-locale old-time filepath directory
+SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base array packedstring
+SUBDIRS += containers bytestring old-locale old-time filepath directory
ifeq "$(GhcLibsWithUnix)" "YES"
SUBDIRS += unix
endif
ifeq "$(Windows)" "YES"
SUBDIRS += $(wildcard Win32)
endif
ifeq "$(GhcLibsWithUnix)" "YES"
SUBDIRS += unix
endif
ifeq "$(Windows)" "YES"
SUBDIRS += $(wildcard Win32)
endif
-SUBDIRS += process pretty hpc template-haskell readline Cabal random haskell98
+SUBDIRS += 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.
# Set GhcBootLibs=YES from the command line to work with just the libraries
# needed to bootstrap GHC.
@@
-215,9
+215,13
@@
all: doc
endif
.PHONY: rebuild.library.%
endif
.PHONY: rebuild.library.%
+.PHONY: remake.library.%
$(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\
$(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\
-rebuild.library.%: clean.library.% make.library.%
+rebuild.library.%: clean.library.% build.library.%
+
+$(foreach SUBDIR,$(SUBDIRS),remake.library.$(SUBDIR)):\
+remake.library.%: clean.library.% make.library.%
# NB. we're depending on make chasing dependencies from left to right here.
# This bit goes wrong with 'make -j'.
# NB. we're depending on make chasing dependencies from left to right here.
# This bit goes wrong with 'make -j'.
@@
-318,7
+322,9
@@
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
$(CABAL_HADDOCK_FLAGS); \
fi
ifneq "$(HSCOLOUR)" ""
$(CABAL_HADDOCK_FLAGS); \
fi
ifneq "$(HSCOLOUR)" ""
- if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/$*/src/; fi
+# We use */src rather than $*/src due to the $(INTEGER_LIBRARY)/integer
+# mismatch
+ if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/*/src/; fi
endif
.PHONY: distclean clean clean.library.%
endif
.PHONY: distclean clean clean.library.%