X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=4249ceec49935ddf6acc4d897ebcbad1a3dea417;hp=65778ee053ae76fce1d3a530a0a5abff7b0ff646;hb=ecb13508a1c09df7b87ba5260a30a2a23bdd46d0;hpb=145c696c44d201e57e33a308142b7f41aac611db diff --git a/libraries/Makefile b/libraries/Makefile index 65778ee..4249cee 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -39,15 +39,17 @@ TOP=.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/cabal-flags.mk -SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base array packedstring -SUBDIRS += containers bytestring old-locale old-time filepath directory +# 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 += containers bytestring old-locale old-time filepath ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix endif ifeq "$(Windows)" "YES" SUBDIRS += $(wildcard Win32) endif -SUBDIRS += process pretty hpc template-haskell editline Cabal random haskell98 +SUBDIRS += directory process pretty hpc template-haskell editline Cabal random haskell98 # Set GhcBootLibs=YES from the command line to work with just the libraries # needed to bootstrap GHC. @@ -63,23 +65,18 @@ SUBDIRS += $(wildcard QuickCheck) SUBDIRS += $(wildcard HUnit) SUBDIRS += $(wildcard mtl) SUBDIRS += $(wildcard time) -SUBDIRS += $(wildcard OpenGL) -SUBDIRS += $(wildcard GLUT) -SUBDIRS += $(wildcard OpenAL) -SUBDIRS += $(wildcard ALUT) SUBDIRS += $(wildcard stm) SUBDIRS += $(wildcard xhtml) -SUBDIRS += $(wildcard cgi) SUBDIRS += $(wildcard parallel) -SUBDIRS_BUILD += $(wildcard ndp) -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) # ----------------------------------------------------------------------------- @@ -123,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 = @@ -133,7 +132,7 @@ CONFIGURE_OPTS += --enable-library-profiling CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling endif -ifneq "$(findstring $(space)dyn$(space), $(space)$(GhcLibWays)$(space))" "" +ifeq "$(BuildSharedLibs)" "YES" CONFIGURE_OPTS += --enable-shared CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared endif @@ -143,9 +142,6 @@ CONFIGURE_OPTS += --enable-split-objs CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting endif -DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \ - $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) - .PHONY: subdirs subdirs: @@ -153,20 +149,22 @@ subdirs: HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries -IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages - CABAL_GHC_FLAGS = -Wall ifeq "$(ghc_ge_605)" "NO" CABAL_GHC_FLAGS += -cpp endif -BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=1,3 -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc +# 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 .PHONY: boot boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf cabal-bin: cabal-bin.hs + -mkdir bootstrapping $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin bootstrapping.conf: cabal-bin @@ -185,21 +183,12 @@ bootstrapping.conf: cabal-bin cd hpc && $(CABAL) install --distpref=dist-bootstrapping --inplace mv $@.tmp $@ -installPackage/installPackage: installPackage.hs - -$(RM) -rf installPackage - mkdir installPackage - $(CP) installPackage.hs installPackage/ - cd installPackage && $(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \ - --make installPackage -o installPackage \ - $(DEPLOYMENT_OPTS) - ifBuildable/ifBuildable: ifBuildable.hs -$(RM) -rf ifBuildable mkdir ifBuildable $(CP) ifBuildable.hs ifBuildable/ ifeq "$(stage)" "2" - cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable \ - $(DEPLOYMENT_OPTS) + cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable else cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable endif @@ -208,10 +197,6 @@ endif all: build -ifeq "$(HADDOCK_DOCS)" "YES" -all: doc -endif - .PHONY: rebuild.library.% .PHONY: remake.library.% @@ -223,8 +208,7 @@ remake.library.%: clean.library.% make.library.% # NB. we're depending on make chasing dependencies from left to right here. # This bit goes wrong with 'make -j'. -build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) \ - installPackage/installPackage +build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) configure: $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)) @@ -235,18 +219,23 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. -ifeq "$(Windows)" "YES" -NONEXISTENT=c:/NONEXISTENT -else -NONEXISTENT=/NONEXISTENT -endif - ALL_CONFIGURE_FLAGS = \ - $(INSTALL_CONFIGURE_FLAGS) \ + $(INSTALL_DIRS_CONFIGURE_FLAGS) \ + $(USE_STAGE1_CONFIGURE_FLAGS) \ + $(COMMON_CONFIGURE_FLAGS) \ --haddock-options="--use-contents=../index.html \ --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 \ @@ -265,9 +254,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 \ @@ -282,10 +269,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).% \ @@ -300,15 +283,19 @@ 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 ifneq "$(HSCOLOUR)" "" -CABAL_HADDOCK_FLAGS=--hyperlink-source +CABAL_HADDOCK_FLAGS += --hyperlink-source endif +CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock -$(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 \ @@ -318,7 +305,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.% @@ -329,14 +319,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) -rf 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) -rf installPackage $(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) @@ -379,46 +372,36 @@ install-docs: # overridden when installing a bindist. $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ -install.library.%: installPackage/installPackage ifBuildable/ifBuildable +install.library.%: ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ - $(FPTOOLS_TOP_ABS)/libraries/installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/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 -binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) \ - installPackage/installPackage - mkdir $(BIN_DIST_LIBDIR)/installPackage - cp installPackage/installPackage $(BIN_DIST_LIBDIR)/installPackage - mkdir $(BIN_DIST_LIBDIR)/ifBuildable - cp ifBuildable/ifBuildable $(BIN_DIST_LIBDIR)/ifBuildable - cp Makefile $(BIN_DIST_LIBDIR) +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 + exit 1 +endif + 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" - cp gen_contents_index $(BIN_DIST_LIBDIR) - cp index.html $(BIN_DIST_LIBDIR) - cp doc-index*.html $(BIN_DIST_LIBDIR) + for FILE in gen_contents_index index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done endif - cp -pR stamp $(BIN_DIST_LIBDIR) $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: if $(IFBUILDABLE) $*; then \ - $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*; \ - cd $* && \ - cp $*.cabal $(BIN_DIST_LIBDIR)/$* && \ - cp LICENSE $(BIN_DIST_LIBDIR)/$* && \ - cp -R dist $(BIN_DIST_LIBDIR)/$* && \ - $(FIND) . -name "*.buildinfo" -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \ - $(FIND) . -name unbuildable -exec cp {} $(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 \ - \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \ - -exec rm {} \; ; \ + $(MAKE) -C $* -f Makefile.local binary-dist BINDIST_EXTRAS="$*.cabal LICENSE $*.buildinfo unbuildable" WHERE_AM_I=$(WHERE_AM_I)/$*; \ fi # Ignore some doc targets that we don't support