X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=ed2d92a5817986ff08e99c9f3ac850cf7e01ddba;hb=b008746d6d36518b6e89484379e45c798d944743;hp=a2b65458752c8c99b20ad3314f36f1bb830d9845;hpb=29f3c1b707d1566ffd413ddd608f004c27538cdf;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index a2b6545..ed2d92a 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -35,15 +35,14 @@ default_target: all TOP=.. include $(TOP)/mk/boilerplate.mk -SUBDIRS = base old-locale old-time directory process filepath pretty \ - template-haskell readline Cabal random haskell98 - +SUBDIRS = base containers bytestring old-locale old-time filepath directory ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix endif ifeq "$(Windows)" "YES" SUBDIRS += $(wildcard Win32) endif +SUBDIRS += process pretty hpc template-haskell readline Cabal random haskell98 # Set GhcBootLibs=YES from the command line to work with just the libraries # needed to bootstrap GHC. @@ -61,7 +60,6 @@ SUBDIRS += $(wildcard mtl) SUBDIRS += $(wildcard fgl) SUBDIRS += $(wildcard X11) SUBDIRS += $(wildcard time) -SUBDIRS += $(wildcard hpc) ifeq "$(Windows)" "NO" # HGL is not working on Win32, so omit it for now. Better not to ship it # at all than to ship a broken version. @@ -99,6 +97,11 @@ CONFIGURE_OPTS += --enable-library-profiling CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling endif +ifneq "$(findstring $(space)dyn$(space), $(space)$(GhcLibWays)$(space))" "" +CONFIGURE_OPTS += --enable-shared +CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared +endif + ifeq "$(SplitObjs)" "YES" CONFIGURE_OPTS += --enable-split-objs CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting @@ -191,10 +194,15 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # the executable with the shell script on non-Windows. This should # probably be tidied up so that we can always pass the same libsubdir. ifeq "$(Windows)" "YES" -libsubdir = $$pkgid +DATA_REL_DIR = . +datadir = $$prefix +libsubdir = $$pkgid else -libsubdir = $$compiler/lib/$$pkgid +DATA_REL_DIR = share/ghc +datadir = $$prefix/share/ghc +libsubdir = $$compiler/lib/$$pkgid endif +DOC_ROOT = $(prefix)/$(DATA_REL_DIR)/doc/html/ # We rely on all the CONFIGURE_ARGS being quoted with '...', and there # being no 's inside the values. @@ -209,13 +217,13 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup ( cd $* && setup/Setup configure \ $(CONFIGURE_OPTS) \ --prefix='$$topdir' \ - --datadir='$$prefix/share' \ + --datadir='$(datadir)' \ + --datasubdir='.' \ --libsubdir='$(libsubdir)' \ --with-compiler=../../compiler/stage1/ghc-inplace$ \ --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \ --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \ --with-ld=$(LD) \ - --datasubdir=ghc \ --haddock-args="--use-contents=../index.html \ --use-index=../doc-index.html" \ $(FLAGGED_CONFIGURE_ARGS) \ @@ -231,22 +239,29 @@ $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/GNUmakefile \ %/setup/Setup ifBuildable/ifBuildable - ifBuildable/ifBuildable $* $(MAKE) - ifBuildable/ifBuildable $* setup/Setup register --inplace + if ifBuildable/ifBuildable $*; then \ + cd $* && \ + $(MAKE) $(MFLAGS) && \ + setup/Setup register --inplace; \ + fi # Build the library using 'setup build' (not the default) $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable - ifBuildable/ifBuildable $* setup/Setup build \ - $(addprefix --ghc-option=,$(GhcLibHcOpts)) + if ifBuildable/ifBuildable $*; then \ + cd $* && \ + setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ + fi $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\ %/GNUmakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable $(RM) $*/GNUmakefile cp Makefile.local $* - ifBuildable/ifBuildable $* setup/Setup makefile -f GNUmakefile + if ifBuildable/ifBuildable $*; then \ + cd $* && setup/Setup makefile -f GNUmakefile; \ + fi .PHONY: doc @@ -258,7 +273,9 @@ doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable - ifBuildable/ifBuildable $* setup/Setup haddock + if ifBuildable/ifBuildable $*; then \ + cd $* && setup/Setup haddock; \ + fi .PHONY: distclean clean clean.library.% @@ -268,6 +285,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -f stamp/bootstrapping.* $(RM) -rf bootstrapping.* $(RM) -rf ifBuildable + $(RM) -rf installPackage $(RM) -f libraries.txt index.html doc-index.html $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ @@ -282,17 +300,15 @@ endif .PHONY: install install-docs install.library.% -ROOT=$(prefix)/share/ghc/doc/html/ - install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) ifeq "$(HADDOCK_DOCS)" "YES" - $(INSTALL_DIR) $(ROOT) - $(INSTALL_DATA) index.html doc-index.html $(ROOT) - $(INSTALL_SCRIPT) gen_contents_index $(ROOT) + $(INSTALL_DIR) $(DOC_ROOT) + $(INSTALL_DATA) index.html doc-index.html $(DOC_ROOT) + $(INSTALL_SCRIPT) gen_contents_index $(DOC_ROOT) # Hacks: - $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.css $(ROOT) - $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.js $(ROOT) - $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.gif $(ROOT) + $(INSTALL_DATA) $(DOC_ROOT)/base/*.css $(DOC_ROOT) + $(INSTALL_DATA) $(DOC_ROOT)/base/*.js $(DOC_ROOT) + $(INSTALL_DATA) $(DOC_ROOT)/base/*.gif $(DOC_ROOT) endif # Cabal doesn't let us ask to install docs only, so do nothing here @@ -304,7 +320,10 @@ install-docs: # Thus if you install without building then it will just break. $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable - ifBuildable/ifBuildable $* ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg + if ifBuildable/ifBuildable $*; then \ + cd $* && \ + ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg; \ + fi .PHONY: binary-dist binary-dist.library.% @@ -324,13 +343,15 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$* - ifBuildable/ifBuildable $* cp $*.cabal $(BIN_DIST_LIBDIR)/$* - ifBuildable/ifBuildable $* cp -a dist $(BIN_DIST_LIBDIR)/$* - # Euch - ifBuildable/ifBuildable $* cp -aL include $(BIN_DIST_LIBDIR)/$* || : - ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ - \( -name "*_split" -o -name "autogen" \) | xargs rm -rf - ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ + if ifBuildable/ifBuildable $*; then \ + cd $* && \ + cp $*.cabal $(BIN_DIST_LIBDIR)/$* && \ + cp -a dist $(BIN_DIST_LIBDIR)/$* && \ + # Euch \ + (cp -aL include $(BIN_DIST_LIBDIR)/$* || :) && \ + $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ + \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \ + $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \ - -exec rm {} \; - + -exec rm {} \; ; \ + fi