X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=928871a658719782e5f6657f7fa0488bb8395c94;hp=d33435e45094fbf9b483e702af0c5f55562bfe8d;hb=9efc323b5b57a0b4d50008c942a90a45dc51ee2d;hpb=4a73af53332e94ca56a6faed96f8391c14ecfa18 diff --git a/libraries/Makefile b/libraries/Makefile index d33435e..928871a 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -17,16 +17,13 @@ # To add a new library to the tree, do # # darcs get http://darcs.haskell.org/packages/foo -# [ -e foo/configure.ac ] && ( cd foo && autoreconf ) +# [ -f foo/configure.ac ] && ( cd foo && autoreconf ) # make make.library.foo -.PHONY: default_target show +.PHONY: default_target 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. @@ -41,7 +38,7 @@ include $(TOP)/mk/cabal-flags.mk # Any libraries listed here should also be in ../packages -SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base syb concurrent unique timeout st getopt base3-compat array packedstring +SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base syb base3-compat array packedstring SUBDIRS += containers bytestring old-locale old-time filepath ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -89,37 +86,6 @@ ifeq "$(ghc_ge_609)" "YES" GhcLibHcOpts += -fno-warn-deprecated-flags endif -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 -idynlibdir = $$topdir -idatadir = $$topdir -idocdir = $$topdir/doc/libraries/$$pkg -ihaddockdir = $$topdir/doc/libraries/$$pkg -ihtmldir = $$httptopdir/doc/libraries/$$pkg -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) -idynlibdir = $(dynlibdir) -idatadir = $(datadir) -idocdir = $(docdir)/libraries/$$pkg -ihaddockdir = $(htmldir)/libraries/$$pkg -ihtmldir = $(htmldir)/libraries/$$pkg -html_installed_root = $(htmldir)/libraries -endif - IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages ifneq "$(DOING_BIN_DIST)" "YES" @@ -142,6 +108,10 @@ CONFIGURE_OPTS += --enable-split-objs CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting endif +ifeq "$(HSCOLOUR_SRCS)" "YES" +CONFIGURE_OPTS += --with-hscolour="$(HSCOLOUR)" +endif + .PHONY: subdirs subdirs: @@ -150,12 +120,6 @@ subdirs: HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries CABAL_GHC_FLAGS = -Wall -ifeq "$(ghc_ge_605)" "NO" -CABAL_GHC_FLAGS += -cpp -endif - -# Euch, hideous hack: -CABAL_VERSION = $(shell grep "^Version:" Cabal/Cabal.cabal | sed -e "s/^Version: //" -e 's/\./,/g') BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc @@ -169,6 +133,10 @@ cabal-bin: cabal-bin.hs bootstrapping.conf: cabal-bin echo "[]" > $@.tmp + -cd extensible-exceptions && $(CABAL) clean --distpref=dist-bootstrapping + cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp + cd extensible-exceptions && $(CABAL) build --distpref=dist-bootstrapping + cd extensible-exceptions && $(CABAL) install --distpref=dist-bootstrapping --inplace -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp cd filepath && $(CABAL) build --distpref=dist-bootstrapping @@ -238,8 +206,7 @@ dph/%: $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \ -stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \ - bootstrapping.conf +stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin -$(RM) -f stamp/configure.library.*.$* $*/unbuildable $(MKDIRHIER) `dirname $@` ( cd $* && $(CABAL) configure $(ALL_CONFIGURE_FLAGS) ) \ @@ -256,7 +223,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \ # every time. $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - cabal-bin ifBuildable/ifBuildable bootstrapping.conf + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ cmp -s $(MAKEFILE_LOCAL) Makefile.local || cp $(MAKEFILE_LOCAL) .; \ @@ -272,7 +239,7 @@ MAKEFILE_LOCAL = $(FPTOOLS_TOP_ABS)/libraries/Makefile.local # Build the library using 'setup build' (not the default) $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - cabal-bin ifBuildable/ifBuildable bootstrapping.conf + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ $(CABAL) build $(BUILD_FLAGS); \ @@ -290,14 +257,14 @@ doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)) sh gen_contents_index --inplace # Making hyperlinked source only works if we have hscolour -ifneq "$(HSCOLOUR)" "" +ifeq "$(HSCOLOUR_SRCS)" "YES" CABAL_HADDOCK_FLAGS += --hyperlink-source endif CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - cabal-bin ifBuildable/ifBuildable bootstrapping.conf + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && $(CABAL) haddock --html-location='../$$pkg' \ $(CABAL_HADDOCK_FLAGS); \ @@ -311,14 +278,16 @@ ifneq "$(HSCOLOUR)" "" if $(IFBUILDABLE) $* && [ -d $*/dist/doc/html/*/src/ ]; then cp hscolour.css $*/dist/doc/html/*/src/; fi endif -.PHONY: distclean clean clean.library.% +.PHONY: maintainer-clean distclean clean clean.library.% +maintainer-clean: clean distclean: clean clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) - -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping - -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping - -cd hpc && $(CABAL) clean --distpref=dist-bootstrapping + -cd extensible-exceptions && $(CABAL) clean --distpref=dist-bootstrapping + -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping + -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping + -cd hpc && $(CABAL) clean --distpref=dist-bootstrapping $(RM) -rf bootstrapping $(RM) -f bootstrapping.conf bootstrapping.conf.old $(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old @@ -331,7 +300,7 @@ ifneq "$(wildcard dph)" "" $(MAKE) -C dph clean endif -distclean: +maintainer-clean distclean: $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak) $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ @@ -351,6 +320,7 @@ ifeq "$(HADDOCK_DOCS)" "YES" $(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) + $(INSTALL_DATA) prologue.txt $(DESTDIR)$(html_installed_root) # Hacks: $(INSTALL_DATA) base/dist/doc/html/*/*.css $(DESTDIR)$(html_installed_root) $(INSTALL_DATA) base/dist/doc/html/*/*.js $(DESTDIR)$(html_installed_root) @@ -375,14 +345,13 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ - $(INSTALL_PACKAGE) install '$(DESTDIR)$(bindir)/ghc-pkg' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ + $(INSTALL_PACKAGE) install '$(GHC_PKG_INSTALL_PROG)' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ fi .PHONY: binary-dist binary-dist.library.% BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries -BINDIST_EXTRAS += ifBuildable/ifBuildable binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) ifeq "$(WHERE_AM_I)" "" echo "I don't know where I am" >&2 @@ -394,8 +363,9 @@ endif # a Cabal package if we keep it. However, once we drop extralibs we can # probably remove it anyway. echo $(WHERE_AM_I)/ifBuildable/ifBuildable >> $(BIN_DIST_LIST) + for FILE in dph/dph-prim-interface/interface/*.h dph/dph/LICENSE; do if [ -f $$FILE ]; then echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); fi; done ifeq "$(HADDOCK_DOCS)" "YES" - for FILE in gen_contents_index index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done + for FILE in gen_contents_index prologue.txt index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done endif $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \