Commit b93e282a authored by Ian Lynagh's avatar Ian Lynagh

MERGED: If we have hscolour then make source code links in teh haddock docs

Fri Nov 23 13:15:59 PST 2007  Ian Lynagh <igloo@earth.li>
parent e517644d
...@@ -927,6 +927,8 @@ dnl ** check for tar ...@@ -927,6 +927,8 @@ dnl ** check for tar
dnl if GNU tar is named gtar, look for it first. dnl if GNU tar is named gtar, look for it first.
AC_PATH_PROGS(TarCmd,gtar tar,tar) AC_PATH_PROGS(TarCmd,gtar tar,tar)
AC_PATH_PROG(HSCOLOUR,HsColour)
dnl ** check for DocBook toolchain dnl ** check for DocBook toolchain
FP_CHECK_DOCBOOK_DTD FP_CHECK_DOCBOOK_DTD
FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/xml/docbook/xsl-stylesheets* /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl]) FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/xml/docbook/xsl-stylesheets* /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl /opt/local/share/xsl/docbook-xsl])
......
...@@ -133,6 +133,10 @@ CONFIGURE_OPTS += --enable-split-objs ...@@ -133,6 +133,10 @@ CONFIGURE_OPTS += --enable-split-objs
CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
endif endif
ifneq "$(HSCOLOUR)" ""
CONFIGURE_OPTS += --with-hscolour=$(HSCOLOUR)
endif
BOOTSTRAP_LIBS = Cabal filepath BOOTSTRAP_LIBS = Cabal filepath
BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS)) BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS))
BOOTSTRAP_INC_1_UP = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS)) BOOTSTRAP_INC_1_UP = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS))
...@@ -283,11 +287,17 @@ html: doc ...@@ -283,11 +287,17 @@ html: doc
doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
sh gen_contents_index --inplace sh gen_contents_index --inplace
# Making hyperlinked source only works if we have hscolour
ifneq "$(HSCOLOUR)" ""
CABAL_HADDOCK_FLAGS=--hyperlink-source
endif
$(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
%/setup/Setup ifBuildable/ifBuildable %/setup/Setup ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \ if ifBuildable/ifBuildable $*; then \
cd $* && setup/Setup haddock --html-location='../$$pkgid'; \ cd $* && setup/Setup haddock --html-location='../$$pkgid' \
$(CABAL_HADDOCK_FLAGS); \
fi fi
.PHONY: distclean clean clean.library.% .PHONY: distclean clean clean.library.%
......
...@@ -1041,6 +1041,8 @@ STRIP = strip ...@@ -1041,6 +1041,8 @@ STRIP = strip
TAR = @TarCmd@ TAR = @TarCmd@
ZIP = zip ZIP = zip
HSCOLOUR = @HSCOLOUR@
# #
# This is special to literate/, ToDo: add literate-specific # This is special to literate/, ToDo: add literate-specific
# configure setup to literate/. # configure setup to literate/.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment