X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=d4ae0ac387efc42c9e56daac4020beca4e619993;hp=1e76edee57fbc9fae4ffdaac74904ac8342c435e;hb=cd98fb768d20a5d7aa13ebf2881bfe391f7b545b;hpb=88aa9117c3bd185e96a0bdc2e935afe180c6decc diff --git a/libraries/Makefile b/libraries/Makefile index 1e76ede..d4ae0ac 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -20,10 +20,13 @@ # [ -e foo/configure.ac ] && ( cd foo && autoreconf ) # make make.library.foo -.PHONY: default_target +.PHONY: default_target show default_target: all +show: + @echo '$(VALUE)="$($(VALUE))"' + # make doesn't give us an easy way to get the libraries built in # dependency order the first time, but not rebuild base (for example) # when we want to rebuild another library later. @@ -88,6 +91,33 @@ space=$(empty) $(empty) # ----------------------------------------------------------------------------- +ifeq "$(RelocatableBuild)" "YES" +# On Windows we want to make moveable bindists, but we need to tell +# ghc-pkg where the haddock docs are. Therefore we completely ignore +# where the user tells us to put the haddock documentation and put it +# somewhere whose relative location we know. When installing we need +# to give Cabal a real path, though. +iprefix = $$topdir +ibindir = $$topdir +ilibdir = $$topdir +ilibexecdir = $$topdir +idatadir = $$topdir +idocdir = $$topdir/doc/libraries/$$pkgid +ihtmldir = $$topdir/doc/libraries/$$pkgid +html_installed_root = $(prefix)/doc/libraries +else +# On non-Windows we can just give absolute paths all the time, and +# thus obey the htmldir that we are given. +iprefix = $(prefix) +ibindir = $(bindir) +ilibdir = $(libdir) +ilibexecdir = $(libexecdir) +idatadir = $(datadir) +idocdir = $(docdir)/libraries/$$pkgid +ihtmldir = $(htmldir)/libraries/$$pkgid +html_installed_root = $(htmldir)/libraries +endif + ifneq "$(DOING_BIN_DIST)" "YES" CONFIGURE_OPTS = @@ -110,8 +140,8 @@ endif BOOTSTRAP_LIBS = Cabal filepath BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS)) -BOOTSTRAP_INC_1_UP = $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS)) -BOOTSTRAP_INC_2_UP = $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS)) +BOOTSTRAP_INC_1_UP = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS)) +BOOTSTRAP_INC_2_UP = -DCABAL_VERSION=1,3 $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS)) .PHONY: subdirs @@ -186,22 +216,8 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. -# We explicitly set datadir to a sensible value, as Cabal (used to?) use -# "C:\\Program Files\\Common Files" -# on Windows - -# We also set libsubdir differently on Windows and non-Windows, as on -# non-Windows the path we deduce is higher up than the path passed to -# 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" -datadir = $$prefix -libsubdir = $$pkgid -else -datadir = $$prefix/share/ghc -libsubdir = $$compiler/lib/$$pkgid -endif -libraryhtmldir = $(htmldir)/libraries +# We put non-existant paths in when configuring, as we require that +# builds don't depend on these paths when making bindists. # We rely on all the CONFIGURE_ARGS being quoted with '...', and there # being no 's inside the values. @@ -215,23 +231,26 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup -$(RM) -f stamp/configure.library.*.$* $*/unbuildable ( cd $* && setup/Setup configure \ $(CONFIGURE_OPTS) \ - --prefix='$$topdir' \ - --datadir='$(datadir)' \ - --datasubdir='$$pkgid' \ - --libsubdir='$(libsubdir)' \ - --docdir='$(libraryhtmldir)' \ - --with-compiler=../../compiler/stage1/ghc-inplace$ \ - --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \ + --prefix=/NONEXISTANT \ + --bindir=/NONEXISTANT \ + --libdir=/NONEXISTANT \ + --libsubdir='$$pkgid' \ + --libexecdir=/NONEXISTANT \ + --datadir=/NONEXISTANT \ + --docdir=/NONEXISTANT \ + --htmldir=/NONEXISTANT \ + --with-compiler=../../compiler/stage1/ghc-inplace \ + --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \ --with-ld=$(LD) \ - --haddock-args="--use-contents=../index.html \ + --haddock-options="--use-contents=../index.html \ --use-index=../doc-index.html" \ $(FLAGGED_CONFIGURE_ARGS) \ --configure-option=--with-cc=$(CC) ) \ && touch $@ || touch $*/unbuildable # We don't touch $@ if configure failed as we would prefer to try # configuring it next time round, rather than assuming it'll still fail. -# This is particularly important for corelibs, where failure means the +# This is particularly important for bootlibs, where failure means the # build dies! # Build the library using 'make' @@ -266,13 +285,13 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\ .PHONY: doc doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) - sh gen_contents_index + sh gen_contents_index --inplace $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ - cd $* && setup/Setup haddock; \ + cd $* && setup/Setup haddock --html-location='../$$pkgid'; \ fi .PHONY: distclean clean clean.library.% @@ -284,7 +303,11 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -rf bootstrapping.* $(RM) -rf ifBuildable $(RM) -rf installPackage - $(RM) -f libraries.txt index.html doc-index.html doc-index-*.html + $(RM) -f libraries.txt index.html doc-index.html doc-index*.html + $(RM) -f haddock* *.gif + +distclean: + $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak) $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ clean.library.%: @@ -300,13 +323,13 @@ endif install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) ifeq "$(HADDOCK_DOCS)" "YES" - $(INSTALL_DIR) $(libraryhtmldir)/html - $(INSTALL_DATA) index.html doc-index.html $(libraryhtmldir)/html - $(INSTALL_SCRIPT) gen_contents_index $(libraryhtmldir)/html + $(INSTALL_DIR) $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) index.html doc-index*.html $(DESTDIR)$(html_installed_root) + $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(html_installed_root) # Hacks: - $(INSTALL_DATA) $(libraryhtmldir)/html/base/*.css $(libraryhtmldir)/html - $(INSTALL_DATA) $(libraryhtmldir)/html/base/*.js $(libraryhtmldir)/html - $(INSTALL_DATA) $(libraryhtmldir)/html/base/*.gif $(libraryhtmldir)/html + $(INSTALL_DATA) base/dist/doc/html/*/*.css $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) base/dist/doc/html/*/*.js $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) base/dist/doc/html/*/*.gif $(DESTDIR)$(html_installed_root) endif # Cabal doesn't let us ask to install docs only, so do nothing here @@ -316,11 +339,18 @@ 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. + +# prefix and (on Windows) htmldir use $topdir when configuring, so we +# need to tell installPackage the real path to use when installing. + +# We also need to pass all the other directories in, as they can be +# overridden when installing a bindist. + $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ cd $* && \ - ../installPackage/installPackage $(DESTDIR)$(prefix) $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace $(DESTDIR)$(libdir)/package.conf; \ + ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' ; \ fi .PHONY: binary-dist binary-dist.library.% @@ -333,20 +363,26 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) mkdir $(BIN_DIST_LIBDIR)/ifBuildable cp ifBuildable/ifBuildable $(BIN_DIST_LIBDIR)/ifBuildable cp Makefile $(BIN_DIST_LIBDIR) +ifeq "$(HADDOCK_DOCS)" "YES" cp gen_contents_index $(BIN_DIST_LIBDIR) cp index.html $(BIN_DIST_LIBDIR) - cp doc-index.html $(BIN_DIST_LIBDIR) - cp -a stamp $(BIN_DIST_LIBDIR) + cp doc-index*.html $(BIN_DIST_LIBDIR) +endif + cp -pR stamp $(BIN_DIST_LIBDIR) + # This gets used in the compiler directory to see if GHC should + # depend on the readline package or not + $(MKDIRHIER) $(BIN_DIST_LIBDIR)/readline + cp readline/config.mk $(BIN_DIST_LIBDIR)/readline $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: - $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$* if ifBuildable/ifBuildable $*; then \ + $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*; \ cd $* && \ cp $*.cabal $(BIN_DIST_LIBDIR)/$* && \ cp LICENSE $(BIN_DIST_LIBDIR)/$* && \ - cp -a dist $(BIN_DIST_LIBDIR)/$* && \ - (cp -aL include $(BIN_DIST_LIBDIR)/$* || :) && \ + cp -R dist $(BIN_DIST_LIBDIR)/$* && \ + (cp -RL include $(BIN_DIST_LIBDIR)/$* || true) && \ $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \ $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \