From 9333f98b6ba928b6fb0e884433813bc29043db6a Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 27 Feb 2009 05:11:38 +0000 Subject: [PATCH] include all optional build parts in haddock & hoogle docs --- Makefile | 5 +++-- Version.hs | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6ba0d2d86..baef5e86c 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ test: ./hledger.hs test PROFBIN=hledgerp -BUILDPROF=ghc --make hledger.hs -prof -auto-all -o $(PROFBIN) +BUILDPROF=ghc $(BUILDFLAGS) --make hledger.hs -prof -auto-all -o $(PROFBIN) RUNPROF=./$(PROFBIN) +RTS -p -RTS PROFCMD=-s balance TIME=`date +"%Y%m%d%H%M"` @@ -207,7 +207,8 @@ colourised-source hscolour: api-doc-dir MAIN=hledger.hs # nb --ignore-all-exports means these are actually implementation docs -HADDOCK=haddock -B `ghc --print-libdir` --no-warnings --ignore-all-exports +HADDOCK=haddock -B `ghc --print-libdir` --no-warnings --ignore-all-exports $(subst -D,--optghc=-D,$(BUILDFLAGS)) + api-doc-with-source: api-doc-dir colourised-source $(MAIN) echo "Generating haddock api docs" ; \ $(HADDOCK) -o api-doc -h --source-module=src-%{MODULE/./-}.html $(filter-out %api-doc-dir colourised-source,$^) ; \ diff --git a/Version.hs b/Version.hs index b364a5365..0606ddb94 100644 --- a/Version.hs +++ b/Version.hs @@ -4,6 +4,10 @@ where import Ledger.Utils import Options (progname) +#ifndef PATCHES +#define PATCHES "0" +#endif + -- updated by build process from VERSION version = "0.3.99" -- PATCHES defined by build process from repo state