projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parsec, regex-base, regex-compat, regex-posix are no longer core-packages
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
594de16
..
881cfc2
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-3,11
+3,16
@@
default_target: build
default_target: build
+ifeq "$(IN_BIN_DIST)" "1"
+include ../Makefile-vars
+else
+# Ideally we'd just include something to give us variables
+# for paths and arguments to tools etc, and those set in mk/build.mk.
TOP=.
include $(TOP)/mk/boilerplate.mk
TOP=.
include $(TOP)/mk/boilerplate.mk
+endif
-SUBDIRS = base filepath haskell98 template-haskell readline \
- regex-base regex-posix regex-compat parsec Cabal
+SUBDIRS = base filepath haskell98 template-haskell readline Cabal
ifeq "$(GhcLibsWithUnix)" "YES"
SUBDIRS += unix
ifeq "$(GhcLibsWithUnix)" "YES"
SUBDIRS += unix
@@
-19,6
+24,10
@@
endif
# Set GhcBootLibs=YES from the command line to work with just the libraries
# needed to bootstrap GHC.
ifneq "$(GhcBootLibs)" "YES"
# Set GhcBootLibs=YES from the command line to work with just the libraries
# needed to bootstrap GHC.
ifneq "$(GhcBootLibs)" "YES"
+SUBDIRS += $(wildcard regex-base)
+SUBDIRS += $(wildcard regex-posix)
+SUBDIRS += $(wildcard regex-compat)
+SUBDIRS += $(wildcard parsec)
SUBDIRS += $(wildcard haskell-src)
SUBDIRS += $(wildcard html)
SUBDIRS += $(wildcard network)
SUBDIRS += $(wildcard haskell-src)
SUBDIRS += $(wildcard html)
SUBDIRS += $(wildcard network)
@@
-50,6
+59,12
@@
endif
empty=
space=$(empty) $(empty)
empty=
space=$(empty) $(empty)
+ifeq "$(Windows)" "YES"
+dot_bat=.bat
+else
+dot_bat=
+endif
+
CONFIGURE_OPTS =
CONFIGURE_STAMP_EXTRAS :=
CONFIGURE_OPTS =
CONFIGURE_STAMP_EXTRAS :=
@@
-60,6
+75,11
@@
endif
BOOTSTRAPPING_CABAL = bootstrapping.cabal
BOOTSTRAPPING_CABAL = bootstrapping.cabal
+.PHONY: subdirs
+
+subdirs:
+ @echo $(SUBDIRS)
+
.PHONY: boot
boot: $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup)
.PHONY: boot
boot: $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup)
@@
-82,7
+102,7
@@
$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
stamp/$(BOOTSTRAPPING_CABAL):
$(RM) -rf $(BOOTSTRAPPING_CABAL)
stamp/$(BOOTSTRAPPING_CABAL):
$(RM) -rf $(BOOTSTRAPPING_CABAL)
- $(CP) -a Cabal $(BOOTSTRAPPING_CABAL)
+ $(CP) -R Cabal $(BOOTSTRAPPING_CABAL)
$(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \;
touch $@
$(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \;
touch $@
@@
-111,10
+131,13
@@
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
cd $* && setup/Setup configure \
$(CONFIGURE_OPTS) \
--prefix=$(prefix) \
cd $* && setup/Setup configure \
$(CONFIGURE_OPTS) \
--prefix=$(prefix) \
- --with-compiler=../../compiler/ghc-inplace \
- --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
+ --with-compiler=../../compiler/ghc-inplace$(dot_bat) \
+ --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$(dot_bat) \
+ --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace$(dot_bat) \
+ --with-ld=$(LD) \
--datasubdir=ghc \
--datasubdir=ghc \
- --haddock-args="--use-contents=../index.html --use-index=../doc-index.html"
+ --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" \
+ --configure-option=--with-cc=$(CC)
touch $@
$(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
touch $@
$(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
@@
-135,7
+158,7
@@
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
%/setup/Setup
cd $* && setup/Setup haddock
%/setup/Setup
cd $* && setup/Setup haddock
-.PHONY: install.library.%
+.PHONY: install install-docs install.library.%
INSTALL_DIR=$(prefix)/share/ghc/doc/html/
INSTALL_DIR=$(prefix)/share/ghc/doc/html/
@@
-147,6
+170,10
@@
install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
$(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.js $(INSTALL_DIR)
$(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.gif $(INSTALL_DIR)
$(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.js $(INSTALL_DIR)
$(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.gif $(INSTALL_DIR)
+# Cabal doesn't let us ask to install docs only, so do nothing here
+install-docs:
+ @:
+
# Ideally this would depend on a stamp/build.library.%, but if it does
# then we can't change the libraries and then just rerun make.
# Thus if you install without building then it will just break.
# Ideally this would depend on a stamp/build.library.%, but if it does
# then we can't change the libraries and then just rerun make.
# Thus if you install without building then it will just break.