X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=68d84f938bbcdd5535dd902eaddce0aa78256a6b;hp=594de168e470ae6ae9b3c34fef01e4b5945c36e0;hb=8fbf686cf52d763f185d85d99ae16bd66eba05b1;hpb=80a290e38a1d53f8db2120dc40f362e5e4498ce6 diff --git a/libraries/Makefile b/libraries/Makefile index 594de16..68d84f9 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -3,11 +3,16 @@ 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 +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 @@ -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" +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) @@ -50,6 +59,12 @@ endif empty= space=$(empty) $(empty) +ifeq "$(Windows)" "YES" +dot_bat=.bat +else +dot_bat= +endif + CONFIGURE_OPTS = CONFIGURE_STAMP_EXTRAS := @@ -58,11 +73,22 @@ CONFIGURE_OPTS += --enable-library-profiling CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling endif +ifeq "$(SplitObjs)" "YES" +CONFIGURE_OPTS += --enable-split-objs +CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting +endif + BOOTSTRAPPING_CABAL = bootstrapping.cabal +.PHONY: subdirs + +subdirs: + @echo $(SUBDIRS) + .PHONY: boot -boot: $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) +boot: ifBuildable/ifBuildable \ + $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) # XXX Hideous hacks: $(GENPRIMOP) --make-haskell-source < ../compiler/prelude/primops.txt > base/GHC/Prim.hs $(GENPRIMOP) --make-haskell-wrappers < ../compiler/prelude/primops.txt > base/GHC/PrimopWrappers.hs @@ -78,11 +104,18 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \ -$(RM) -rf $*/setup mkdir $*/setup $(CP) $*/Setup.*hs $*/setup - cd $*/setup && $(GHC) --make -i../../$(BOOTSTRAPPING_CABAL) Setup.*hs -o Setup + cd $*/setup && $(GHC) -Wall --make -i../../$(BOOTSTRAPPING_CABAL) Setup.*hs -o Setup + +ifBuildable/ifBuildable: ifBuildable.hs stamp/$(BOOTSTRAPPING_CABAL) + -$(RM) -rf ifBuildable + mkdir ifBuildable + $(CP) ifBuildable.hs ifBuildable/ + cd ifBuildable && $(GHC) -Wall --make -i../$(BOOTSTRAPPING_CABAL) \ + ifBuildable -o ifBuildable 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 $@ @@ -111,17 +144,22 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup 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 \ - --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" + --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" \ + $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \ + --configure-option=--with-cc=$(CC) touch $@ $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup - cd $* && setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)) - cd $* && setup/Setup register --inplace + cd $* && ../ifBuildable/ifBuildable setup/Setup build \ + $(addprefix --ghc-option=,$(GhcLibHcOpts)) + cd $* && ../ifBuildable/ifBuildable setup/Setup register --inplace .PHONY: doc @@ -135,17 +173,23 @@ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup cd $* && setup/Setup haddock -.PHONY: install.library.% +.PHONY: install install-docs install.library.% INSTALL_DIR=$(prefix)/share/ghc/doc/html/ install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) +ifneq "$(NO_HADDOCK_DOCS)" "YES" $(INSTALL_DATA) index.html doc-index.html $(INSTALL_DIR) $(INSTALL_SCRIPT) gen_contents_index $(INSTALL_DIR) # Hacks: $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.css $(INSTALL_DIR) $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.js $(INSTALL_DIR) $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.gif $(INSTALL_DIR) +endif + +# 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. @@ -153,22 +197,26 @@ install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) $(foreach SUBDIR,$(SUBDIRS),stamp/configure.library.install.$(SUBDIR)): \ stamp/configure.library.install.%: %/setup/Setup -$(RM) -f stamp/configure.library.*.$* - cd $* && setup/Setup configure $(CONFIGURE_OPTS) \ - --prefix=$(prefix) \ - --with-compiler=$(bindir)/ghc \ - --datasubdir=ghc + cd $* && ../ifBuildable/ifBuildable setup/Setup configure \ + $(CONFIGURE_OPTS) \ + --prefix=$(prefix) \ + --with-compiler=$(bindir)/ghc \ + --datasubdir=ghc touch $@ # We need to reconfigure as we now need to register with the normal ghc-pkg $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: stamp/configure.library.install.% %/setup/Setup - cd $* && setup/Setup install + cd $* && ../ifBuildable/ifBuildable setup/Setup install + +.PHONY: distclean clean clean.library.% -.PHONY: clean clean.library.% +distclean: clean clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -f stamp/$(BOOTSTRAPPING_CABAL) $(RM) -rf $(BOOTSTRAPPING_CABAL) + $(RM) -rf ifBuildable $(RM) -f libraries.txt index.html doc-index.html $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \