X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=fc329b2b0132287523d716ff0f300fd2f41eb6c1;hb=d92b83b91324d24a8caf243a1eedd070cc455b6d;hp=6cc349b4239f7d04758de560a13d9b98bbd6b3d8;hpb=2de31b61d0a963803eb5632c9659c6093d74f345;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 6cc349b..fc329b2 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -41,7 +41,7 @@ include $(TOP)/mk/cabal-flags.mk # Any libraries listed here should also be in ../packages -SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base array packedstring +SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base base3-compat array packedstring SUBDIRS += containers bytestring old-locale old-time filepath directory ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -68,14 +68,15 @@ SUBDIRS += $(wildcard time) SUBDIRS += $(wildcard stm) SUBDIRS += $(wildcard xhtml) SUBDIRS += $(wildcard parallel) -SUBDIRS_BUILD += $(wildcard dph/dph-base) -SUBDIRS_BUILD += $(wildcard dph/dph-prim-interface) -SUBDIRS_BUILD += $(wildcard dph/dph-prim-seq) -SUBDIRS_BUILD += $(wildcard dph/dph-prim-par) -SUBDIRS_BUILD += $(wildcard dph/dph) +ifneq "$(wildcard dph)" "" +SUBDIRS += dph/dph-base +SUBDIRS += dph/dph-prim-interface +SUBDIRS += dph/dph-prim-seq +SUBDIRS += dph/dph-prim-par +SUBDIRS += dph/dph-seq +SUBDIRS += dph/dph-par +endif endif - -SUBDIRS += $(SUBDIRS_BUILD) # ----------------------------------------------------------------------------- @@ -119,6 +120,8 @@ ihtmldir = $(htmldir)/libraries/$$pkg html_installed_root = $(htmldir)/libraries endif +IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages + ifneq "$(DOING_BIN_DIST)" "YES" CONFIGURE_OPTS = @@ -146,8 +149,6 @@ subdirs: HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries -IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages - CABAL_GHC_FLAGS = -Wall ifeq "$(ghc_ge_605)" "NO" CABAL_GHC_FLAGS += -cpp @@ -163,7 +164,7 @@ BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf cabal-bin: cabal-bin.hs - mkdir $(HERE_ABS)/bootstrapping + mkdir bootstrapping $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin bootstrapping.conf: cabal-bin @@ -230,6 +231,15 @@ ALL_CONFIGURE_FLAGS = \ --use-index=../doc-index.html" \ $(CONFIGURE_OPTS) +stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-par: \ + dph/dph-par + +stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-seq: \ + dph/dph-seq + +dph/%: + $(MAKE) -C dph $* + $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \ @@ -248,9 +258,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \ # needs to be done. However, we're careful not to overwrite GNUmakefile # if it hasn't changed, so that dependency-generation isn't forced # every time. -# Packages in $(SUBDIRS_BUILD) need to use the build.* rules instead of -# make.*, so filter them out and use an alternate rule below instead. -$(foreach SUBDIR,$(filter-out $(SUBDIRS_BUILD),$(SUBDIRS)),make.library.$(SUBDIR)):\ +$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ cabal-bin ifBuildable/ifBuildable bootstrapping.conf if $(IFBUILDABLE) $*; then \ @@ -265,10 +273,6 @@ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ MAKEFILE_LOCAL = $(FPTOOLS_TOP_ABS)/libraries/Makefile.local -# Alternate rule, as described above -$(foreach SUBDIR,$(SUBDIRS_BUILD),make.library.$(SUBDIR)):\ -make.library.%: build.library.% - # Build the library using 'setup build' (not the default) $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ @@ -283,7 +287,10 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ html: doc -doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) +# No docs for compat libraries for now. +DOC_SUBDIRS = $(filter-out %-compat, $(SUBDIRS)) + +doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)) sh gen_contents_index --inplace # Making hyperlinked source only works if we have hscolour @@ -291,7 +298,7 @@ ifneq "$(HSCOLOUR)" "" CABAL_HADDOCK_FLAGS=--hyperlink-source endif -$(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ +$(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ cabal-bin ifBuildable/ifBuildable bootstrapping.conf if $(IFBUILDABLE) $*; then \ @@ -301,7 +308,10 @@ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ ifneq "$(HSCOLOUR)" "" # We use */src rather than $*/src due to the $(INTEGER_LIBRARY)/integer # mismatch - if $(IFBUILDABLE) $*; then cp hscolour.css $*/dist/doc/html/*/src/; fi +# XXX We also need to check that the directory exists, as e.g. dph disables +# haddock, so the directory doesn't get made. We should remove this once +# we can always haddock everything. + if $(IFBUILDABLE) $* && [ -d $*/dist/doc/html/*/src/ ]; then cp hscolour.css $*/dist/doc/html/*/src/; fi endif .PHONY: distclean clean clean.library.% @@ -312,13 +322,17 @@ 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 - $(RM) -rfd bootstrapping + $(RM) -rf bootstrapping $(RM) -f bootstrapping.conf bootstrapping.conf.old $(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old $(RM) -f cabal-bin cabal-bin.exe $(RM) -rf ifBuildable $(RM) -f libraries.txt index.html doc-index.html doc-index*.html $(RM) -f haddock* *.gif + $(RM) -rf stamp/* +ifneq "$(wildcard dph)" "" + $(MAKE) -C dph clean +endif distclean: $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak) @@ -364,7 +378,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ - $(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ + $(INSTALL_PACKAGE) install '$(DESTDIR)$(bindir)/ghc-pkg' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ fi .PHONY: binary-dist binary-dist.library.% @@ -372,14 +386,16 @@ install.library.%: ifBuildable/ifBuildable BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries BINDIST_EXTRAS += ifBuildable/ifBuildable -ifeq "$(HADDOCK_DOCS)" "YES" -BINDIST_EXTRAS += gen_contents_index -BINDIST_EXTRAS += index.html -BINDIST_EXTRAS += doc-index*.html -endif binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) -# This is a bit of a hack, but it works... echo $(WHERE_AM_I)/Makefile >> $(BIN_DIST_LIST) +# XXX This needs to be changed: This ifBuildable is built with the +# bootstrapping compiler, so isn't OS X friendly. It should be made into +# 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) +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 +endif $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: