diff --git a/Makefile b/Makefile
index 41b66f7e5..aa6f7ac85 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@ VERSIONSENSITIVEFILES=\
 	$(CABALFILES) \
 	hledger-web/.hledger/web/.version \
 
-#BINARYFILENAME=$(shell touch $(VERSIONHS); runhaskell -ihledger $(MAIN) --binary-filename)
+BINARYFILENAME:=$(shell touch $(VERSIONHS); runhaskell -ihledger -ihledger-lib $(MAIN) --binary-filename)
 RELEASEBINARYSUFFIX:=$(shell echo "-$(VERSION)-`uname`-`arch`" | tr '[:upper:]' '[:lower:]')
 
 default: tag hledger
@@ -263,32 +263,46 @@ linuxbinary-%:
 linuxbinary-hledger-chart:
 	ghc --make hledger-chart/hledger-chart.hs -o bin/hledger-chart$(RELEASEBINARYSUFFIX) $(LINUXRELEASEBUILDFLAGS) -lpixman-1 -v
 
-# build a deployable binary for mac, using only standard osx libs
-# The scary link commands are copied from ghc --make -v, with -framework GMP removed.
-# The GMP framework is not installed on most macs, and linking without it doesn't break anything that I'm aware of.
-hledgermac:
-	ghc -c --make $(MAIN) $(MACRELEASEBUILDFLAGS) -o bin/$(BINARYFILENAME)
-	gcc -o bin/$(BINARYFILENAME) -march=i686 -m32 hledger/hledger.o hledger/Hledger/Cli/Main.o hledger-lib/Hledger/Data.o hledger/Hledger/Cli/Commands.o hledger/Hledger/Cli/Options.o hledger/Hledger/Cli/Tests.o hledger/Hledger/Cli/Utils.o hledger/Hledger/Cli/Version.o hledger-lib/Hledger/Data/Utils.o hledger-lib/Hledger/Data/Account.o hledger-lib/Hledger/Data/AccountName.o hledger-lib/Hledger/Data/Amount.o hledger-lib/Hledger/Data/Commodity.o hledger-lib/Hledger/Data/Dates.o hledger-lib/Hledger/Data/Transaction.o hledger-lib/Hledger/Data/Journal.o hledger-lib/Hledger/Data/Ledger.o hledger-lib/Hledger/Data/Posting.o hledger-lib/Hledger/Data/TimeLog.o hledger-lib/Hledger/Data/Types.o hledger-lib/Hledger/Read.o hledger-lib/Hledger/Read/Utils.o hledger-lib/Hledger/Read/JournalReader.o hledger-lib/Hledger/Read/TimelogReader.o hledger/Hledger/Cli/Add.o hledger/Hledger/Cli/Balance.o hledger/Hledger/Cli/Convert.o hledger/Hledger/Cli/Histogram.o hledger/Hledger/Cli/Print.o hledger/Hledger/Cli/Register.o hledger/Hledger/Cli/Stats.o -L/usr/lib -L/Users/simon/.cabal/lib/time-1.2.0.3/ghc-6.12.3 -L/usr/lib -L/Users/simon/.cabal/lib/split-0.1.2/ghc-6.12.3 -L/opt/local/lib -L/Users/simon/.cabal/lib/safe-0.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/regexpr-0.5.1/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/process-1.0.1.3 -L/Users/simon/.cabal/lib/mtlparse-0.0.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/haskeline-0.6.3.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/utf8-string-0.3.6/ghc-6.12.3 -L/Users/simon/.cabal/lib/terminfo-0.3.1.3/ghc-6.12.3 -L/Users/simon/.cabal/lib/mtl-2.0.1.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/transformers-0.2.2.0/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/extensible-exceptions-0.1.1.1 -L/usr/local/lib/ghc-6.12.3/directory-1.0.1.1 -L/usr/local/lib/ghc-6.12.3/unix-2.4.0.2 -L/usr/local/lib/ghc-6.12.3/old-time-1.0.0.5 -L/usr/local/lib/ghc-6.12.3/old-locale-1.0.0.2 -L/Users/simon/.cabal/lib/csv-0.1.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/parsec-2.1.0.1/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/filepath-1.1.0.4 -L/usr/local/lib/ghc-6.12.3/containers-0.3.0.0 -L/usr/local/lib/ghc-6.12.3/array-0.3.0.1 -L/usr/local/lib/ghc-6.12.3/bytestring-0.9.1.7 -L/usr/local/lib/ghc-6.12.3/base-3.0.3.2 -L/usr/local/lib/ghc-6.12.3/syb-0.1.0.2 -L/Users/simon/.cabal/lib/HUnit-1.2.2.1/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/base-4.2.0.2 -L/usr/local/lib/ghc-6.12.3/integer-gmp-0.2.0.1 -L/usr/local/lib/ghc-6.12.3/ghc-prim-0.2.0.0 -L/usr/local/lib/ghc-6.12.3 -lHSrtsmain -lHStime-1.2.0.3 -lHSsplit-0.1.2 -lHSsafe-0.2 -lHSregexpr-0.5.1 -lHSprocess-1.0.1.3 -lHSmtlparse-0.0.1 -lHShaskeline-0.6.3.2 -liconv -lHSutf8-string-0.3.6 -lHSterminfo-0.3.1.3 -lncurses -lHSmtl-2.0.1.0 -lHStransformers-0.2.2.0 -lHSextensible-exceptions-0.1.1.1 -lHSdirectory-1.0.1.1 -lHSunix-2.4.0.2 -ldl -lHSold-time-1.0.0.5 -lHSold-locale-1.0.0.2 -lHScsv-0.1.1 -lHSparsec-2.1.0.1 -lHSfilepath-1.1.0.4 -lHScontainers-0.3.0.0 -lHSarray-0.3.0.1 -lHSbytestring-0.9.1.7 -lHSbase-3.0.3.2 -lHSsyb-0.1.0.2 -lHSHUnit-1.2.2.1 -lHSbase-4.2.0.2 -liconv -lHSinteger-gmp-0.2.0.1 -lHSghc-prim-0.2.0.0 -lHSrts -lm -ldl -u _ghczmprim_GHCziTypes_Izh_static_info -u _ghczmprim_GHCziTypes_Czh_static_info -u _ghczmprim_GHCziTypes_Fzh_static_info -u _ghczmprim_GHCziTypes_Dzh_static_info -u _base_GHCziPtr_Ptr_static_info -u _base_GHCziWord_Wzh_static_info -u _base_GHCziInt_I8zh_static_info -u _base_GHCziInt_I16zh_static_info -u _base_GHCziInt_I32zh_static_info -u _base_GHCziInt_I64zh_static_info -u _base_GHCziWord_W8zh_static_info -u _base_GHCziWord_W16zh_static_info -u _base_GHCziWord_W32zh_static_info -u _base_GHCziWord_W64zh_static_info -u _base_GHCziStable_StablePtr_static_info -u _ghczmprim_GHCziTypes_Izh_con_info -u _ghczmprim_GHCziTypes_Czh_con_info -u _ghczmprim_GHCziTypes_Fzh_con_info -u _ghczmprim_GHCziTypes_Dzh_con_info -u _base_GHCziPtr_Ptr_con_info -u _base_GHCziPtr_FunPtr_con_info -u _base_GHCziStable_StablePtr_con_info -u _ghczmprim_GHCziBool_False_closure -u _ghczmprim_GHCziBool_True_closure -u _base_GHCziPack_unpackCString_closure -u _base_GHCziIOziException_stackOverflow_closure -u _base_GHCziIOziException_heapOverflow_closure -u _base_ControlziExceptionziBase_nonTermination_closure -u _base_GHCziIOziException_blockedIndefinitelyOnMVar_closure -u _base_GHCziIOziException_blockedIndefinitelyOnSTM_closure -u _base_ControlziExceptionziBase_nestedAtomically_closure -u _base_GHCziWeak_runFinalizzerBatch_closure -u _base_GHCziTopHandler_runIO_closure -u _base_GHCziTopHandler_runNonIO_closure -u _base_GHCziConc_ensureIOManagerIsRunning_closure -u _base_GHCziConc_runSparks_closure -u _base_GHCziConc_runHandlers_closure -Wl,-search_paths_first -read_only_relocs warning -lHSffi
-	-ghc -c --make hledger-web/hledger-web.hs $(MACRELEASEBUILDFLAGS) -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-web/'`
-	-gcc -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-web/'` -march=i686 -m32 hledger-web/hledger-web.o hledger-web/Hledger/Web/Main.o hledger/Hledger/Cli/Options.o hledger/Hledger/Cli/Utils.o hledger/Hledger/Cli/Version.o hledger-lib/Hledger/Data.o hledger-web/Hledger/Web/App.o hledger-web/Hledger/Web/Files.o hledger-web/Hledger/Web/Settings.o hledger-lib/Hledger/Data/Account.o hledger-lib/Hledger/Data/AccountName.o hledger-lib/Hledger/Data/Amount.o hledger-lib/Hledger/Data/Commodity.o hledger-lib/Hledger/Data/Dates.o hledger-lib/Hledger/Data/Transaction.o hledger-lib/Hledger/Data/Journal.o hledger-lib/Hledger/Data/Ledger.o hledger-lib/Hledger/Data/Posting.o hledger-lib/Hledger/Data/TimeLog.o hledger-lib/Hledger/Data/Types.o hledger-lib/Hledger/Data/Utils.o hledger-lib/Hledger/Read.o hledger-lib/Hledger/Read/Utils.o hledger-lib/Hledger/Read/JournalReader.o hledger-lib/Hledger/Read/TimelogReader.o hledger/Hledger/Cli/Add.o hledger/Hledger/Cli/Balance.o hledger/Hledger/Cli/Print.o hledger/Hledger/Cli/Register.o -L/usr/lib -L/Users/simon/.cabal/lib/yesod-0.6.6/ghc-6.12.3 -L/usr/lib -L/opt/local/lib -L/Users/simon/.cabal/lib/data-default-0.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/xss-sanitize-0.2.4/ghc-6.12.3 -L/Users/simon/.cabal/lib/web-routes-0.23.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/wai-extra-0.2.4.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/zlib-bindings-0.0.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/zlib-0.5.2.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/wai-0.2.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/tagsoup-0.11.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/split-0.1.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/safe-0.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/regexpr-0.5.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/pureMD5-1.1.0.0/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/process-1.0.1.3 -L/Users/simon/.cabal/lib/persistent-0.3.0.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/web-routes-quasi-0.6.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/stm-2.1.2.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/network-2.2.1.7/ghc-6.12.3 -L/Users/simon/.cabal/lib/neither-0.1.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/mtlparse-0.0.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/io-storage-0.3/ghc-6.12.3 -L/Users/simon/.cabal/lib/haskeline-0.6.3.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/utf8-string-0.3.6/ghc-6.12.3 -L/Users/simon/.cabal/lib/terminfo-0.3.1.3/ghc-6.12.3 -L/Users/simon/.cabal/lib/mtl-2.0.1.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/hamlet-0.6.0.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/file-embed-0.0.3/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/template-haskell-2.4.0.1 -L/usr/local/lib/ghc-6.12.3/pretty-1.0.1.1 -L/Users/simon/.cabal/lib/failure-0.1.0/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/extensible-exceptions-0.1.1.1 -L/Users/simon/.cabal/lib/enumerator-0.4.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/transformers-0.2.2.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/email-validate-0.2.5/ghc-6.12.3 -L/Users/simon/.cabal/lib/ranges-0.2.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/parsec-2.1.0.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/clientsession-0.4.0.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/random-1.0.0.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/time-1.2.0.3/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/directory-1.0.1.1 -L/usr/local/lib/ghc-6.12.3/unix-2.4.0.2 -L/usr/local/lib/ghc-6.12.3/old-time-1.0.0.5 -L/usr/local/lib/ghc-6.12.3/old-locale-1.0.0.2 -L/usr/local/lib/ghc-6.12.3/filepath-1.1.0.4 -L/Users/simon/.cabal/lib/cereal-0.3.0.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/blaze-builder-0.2.0.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/text-0.10.0.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/deepseq-1.1.0.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/binary-0.5.0.2/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/containers-0.3.0.0 -L/Users/simon/.cabal/lib/base64-bytestring-0.1.0.1/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/bytestring-0.9.1.7 -L/usr/local/lib/ghc-6.12.3/base-3.0.3.2 -L/usr/local/lib/ghc-6.12.3/syb-0.1.0.2 -L/usr/local/lib/ghc-6.12.3/array-0.3.0.1 -L/Users/simon/.cabal/lib/HUnit-1.2.2.1/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/base-4.2.0.2 -L/usr/local/lib/ghc-6.12.3/integer-gmp-0.2.0.1 -L/usr/local/lib/ghc-6.12.3/ghc-prim-0.2.0.0 -L/usr/local/lib/ghc-6.12.3 -lHSrtsmain -lHSyesod-0.6.6 -lHSdata-default-0.2 -lHSxss-sanitize-0.2.4 -lHSweb-routes-0.23.1 -lHSwai-extra-0.2.4.2 -lHSzlib-bindings-0.0.0 -lHSzlib-0.5.2.0 -lz -lHSwai-0.2.0 -lHStagsoup-0.11.1 -lHSsplit-0.1.2 -lHSsafe-0.2 -lHSregexpr-0.5.1 -lHSpureMD5-1.1.0.0 -lHSprocess-1.0.1.3 -lHSpersistent-0.3.0.1 -lHSweb-routes-quasi-0.6.2 -lHSstm-2.1.2.2 -lHSnetwork-2.2.1.7 -lHSneither-0.1.0 -lHSmtlparse-0.0.1 -lHSio-storage-0.3 -lHShaskeline-0.6.3.2 -liconv -lHSutf8-string-0.3.6 -lHSterminfo-0.3.1.3 -lncurses -lHSmtl-2.0.1.0 -lHShamlet-0.6.0.1 -lHSfile-embed-0.0.3 -lHStemplate-haskell-2.4.0.1 -lHSpretty-1.0.1.1 -lHSfailure-0.1.0 -lHSextensible-exceptions-0.1.1.1 -lHSenumerator-0.4.2 -lHStransformers-0.2.2.0 -lHSemail-validate-0.2.5 -lHSranges-0.2.2 -lHSparsec-2.1.0.1 -lHSclientsession-0.4.0.2 -lHSrandom-1.0.0.2 -lHStime-1.2.0.3 -lHSdirectory-1.0.1.1 -lHSunix-2.4.0.2 -ldl -lHSold-time-1.0.0.5 -lHSold-locale-1.0.0.2 -lHSfilepath-1.1.0.4 -lHScereal-0.3.0.0 -lHSblaze-builder-0.2.0.1 -lHStext-0.10.0.0 -lHSdeepseq-1.1.0.0 -lHSbinary-0.5.0.2 -lHScontainers-0.3.0.0 -lHSbase64-bytestring-0.1.0.1 -lHSbytestring-0.9.1.7 -lHSbase-3.0.3.2 -lHSsyb-0.1.0.2 -lHSarray-0.3.0.1 -lHSHUnit-1.2.2.1 -lHSbase-4.2.0.2 -liconv -lHSinteger-gmp-0.2.0.1 -lHSghc-prim-0.2.0.0 -lHSrts -lm -ldl -u _ghczmprim_GHCziTypes_Izh_static_info -u _ghczmprim_GHCziTypes_Czh_static_info -u _ghczmprim_GHCziTypes_Fzh_static_info -u _ghczmprim_GHCziTypes_Dzh_static_info -u _base_GHCziPtr_Ptr_static_info -u _base_GHCziWord_Wzh_static_info -u _base_GHCziInt_I8zh_static_info -u _base_GHCziInt_I16zh_static_info -u _base_GHCziInt_I32zh_static_info -u _base_GHCziInt_I64zh_static_info -u _base_GHCziWord_W8zh_static_info -u _base_GHCziWord_W16zh_static_info -u _base_GHCziWord_W32zh_static_info -u _base_GHCziWord_W64zh_static_info -u _base_GHCziStable_StablePtr_static_info -u _ghczmprim_GHCziTypes_Izh_con_info -u _ghczmprim_GHCziTypes_Czh_con_info -u _ghczmprim_GHCziTypes_Fzh_con_info -u _ghczmprim_GHCziTypes_Dzh_con_info -u _base_GHCziPtr_Ptr_con_info -u _base_GHCziPtr_FunPtr_con_info -u _base_GHCziStable_StablePtr_con_info -u _ghczmprim_GHCziBool_False_closure -u _ghczmprim_GHCziBool_True_closure -u _base_GHCziPack_unpackCString_closure -u _base_GHCziIOziException_stackOverflow_closure -u _base_GHCziIOziException_heapOverflow_closure -u _base_ControlziExceptionziBase_nonTermination_closure -u _base_GHCziIOziException_blockedIndefinitelyOnMVar_closure -u _base_GHCziIOziException_blockedIndefinitelyOnSTM_closure -u _base_ControlziExceptionziBase_nestedAtomically_closure -u _base_GHCziWeak_runFinalizzerBatch_closure -u _base_GHCziTopHandler_runIO_closure -u _base_GHCziTopHandler_runNonIO_closure -u _base_GHCziConc_ensureIOManagerIsRunning_closure -u _base_GHCziConc_runSparks_closure -u _base_GHCziConc_runHandlers_closure -Wl,-search_paths_first -read_only_relocs warning -lHSffi
-	-ghc -c --make hledger-vty/hledger-vty.hs $(MACRELEASEBUILDFLAGS) -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-vty/'`
-	-gcc -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-vty/'` -march=i686 -m32 hledger-vty/hledger-vty.o hledger-vty/Hledger/Vty/Main.o hledger/Hledger/Cli/Balance.o hledger/Hledger/Cli/Options.o hledger/Hledger/Cli/Print.o hledger/Hledger/Cli/Register.o hledger/Hledger/Cli/Utils.o hledger/Hledger/Cli/Version.o hledger-lib/Hledger/Data.o hledger-lib/Hledger/Data/Account.o hledger-lib/Hledger/Data/AccountName.o hledger-lib/Hledger/Data/Amount.o hledger-lib/Hledger/Data/Commodity.o hledger-lib/Hledger/Data/Dates.o hledger-lib/Hledger/Data/Transaction.o hledger-lib/Hledger/Data/Ledger.o hledger-lib/Hledger/Data/Journal.o hledger-lib/Hledger/Data/Posting.o hledger-lib/Hledger/Data/TimeLog.o hledger-lib/Hledger/Data/Types.o hledger-lib/Hledger/Data/Utils.o hledger-lib/Hledger/Read.o hledger-lib/Hledger/Read/Utils.o hledger-lib/Hledger/Read/JournalReader.o hledger-lib/Hledger/Read/TimelogReader.o -L/usr/lib -L/Users/simon/.cabal/lib/vty-4.6.0.1/ghc-6.12.3 -L/usr/lib -L/opt/local/lib -L/Users/simon/.cabal/lib/parallel-2.2.0.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/utf8-string-0.3.6/ghc-6.12.3 -L/Users/simon/.cabal/lib/time-1.2.0.3/ghc-6.12.3 -L/Users/simon/.cabal/lib/terminfo-0.3.1.3/ghc-6.12.3 -L/Users/simon/.cabal/lib/split-0.1.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/safe-0.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/regexpr-0.5.1/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/process-1.0.1.3 -L/Users/simon/.cabal/lib/parsec-2.1.0.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/mtlparse-0.0.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/mtl-2.0.1.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/transformers-0.2.2.0/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/extensible-exceptions-0.1.1.1 -L/usr/local/lib/ghc-6.12.3/directory-1.0.1.1 -L/usr/local/lib/ghc-6.12.3/unix-2.4.0.2 -L/usr/local/lib/ghc-6.12.3/old-time-1.0.0.5 -L/usr/local/lib/ghc-6.12.3/old-locale-1.0.0.2 -L/usr/local/lib/ghc-6.12.3/filepath-1.1.0.4 -L/Users/simon/.cabal/lib/deepseq-1.1.0.0/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/containers-0.3.0.0 -L/usr/local/lib/ghc-6.12.3/bytestring-0.9.1.7 -L/usr/local/lib/ghc-6.12.3/base-3.0.3.2 -L/usr/local/lib/ghc-6.12.3/syb-0.1.0.2 -L/usr/local/lib/ghc-6.12.3/array-0.3.0.1 -L/Users/simon/.cabal/lib/HUnit-1.2.2.1/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/base-4.2.0.2 -L/usr/local/lib/ghc-6.12.3/integer-gmp-0.2.0.1 -L/usr/local/lib/ghc-6.12.3/ghc-prim-0.2.0.0 -L/usr/local/lib/ghc-6.12.3 -lHSrtsmain -lHSvty-4.6.0.1 -lHSparallel-2.2.0.1 -lHSutf8-string-0.3.6 -lHStime-1.2.0.3 -lHSterminfo-0.3.1.3 -lncurses -lHSsplit-0.1.2 -lHSsafe-0.2 -lHSregexpr-0.5.1 -lHSprocess-1.0.1.3 -lHSparsec-2.1.0.1 -lHSmtlparse-0.0.1 -lHSmtl-2.0.1.0 -lHStransformers-0.2.2.0 -lHSextensible-exceptions-0.1.1.1 -lHSdirectory-1.0.1.1 -lHSunix-2.4.0.2 -ldl -lHSold-time-1.0.0.5 -lHSold-locale-1.0.0.2 -lHSfilepath-1.1.0.4 -lHSdeepseq-1.1.0.0 -lHScontainers-0.3.0.0 -lHSbytestring-0.9.1.7 -lHSbase-3.0.3.2 -lHSsyb-0.1.0.2 -lHSarray-0.3.0.1 -lHSHUnit-1.2.2.1 -lHSbase-4.2.0.2 -liconv -lHSinteger-gmp-0.2.0.1 -lHSghc-prim-0.2.0.0 -lHSrts -lm -ldl -u _ghczmprim_GHCziTypes_Izh_static_info -u _ghczmprim_GHCziTypes_Czh_static_info -u _ghczmprim_GHCziTypes_Fzh_static_info -u _ghczmprim_GHCziTypes_Dzh_static_info -u _base_GHCziPtr_Ptr_static_info -u _base_GHCziWord_Wzh_static_info -u _base_GHCziInt_I8zh_static_info -u _base_GHCziInt_I16zh_static_info -u _base_GHCziInt_I32zh_static_info -u _base_GHCziInt_I64zh_static_info -u _base_GHCziWord_W8zh_static_info -u _base_GHCziWord_W16zh_static_info -u _base_GHCziWord_W32zh_static_info -u _base_GHCziWord_W64zh_static_info -u _base_GHCziStable_StablePtr_static_info -u _ghczmprim_GHCziTypes_Izh_con_info -u _ghczmprim_GHCziTypes_Czh_con_info -u _ghczmprim_GHCziTypes_Fzh_con_info -u _ghczmprim_GHCziTypes_Dzh_con_info -u _base_GHCziPtr_Ptr_con_info -u _base_GHCziPtr_FunPtr_con_info -u _base_GHCziStable_StablePtr_con_info -u _ghczmprim_GHCziBool_False_closure -u _ghczmprim_GHCziBool_True_closure -u _base_GHCziPack_unpackCString_closure -u _base_GHCziIOziException_stackOverflow_closure -u _base_GHCziIOziException_heapOverflow_closure -u _base_ControlziExceptionziBase_nonTermination_closure -u _base_GHCziIOziException_blockedIndefinitelyOnMVar_closure -u _base_GHCziIOziException_blockedIndefinitelyOnSTM_closure -u _base_ControlziExceptionziBase_nestedAtomically_closure -u _base_GHCziWeak_runFinalizzerBatch_closure -u _base_GHCziTopHandler_runIO_closure -u _base_GHCziTopHandler_runNonIO_closure -u _base_GHCziConc_ensureIOManagerIsRunning_closure -u _base_GHCziConc_runSparks_closure -u _base_GHCziConc_runHandlers_closure -Wl,-search_paths_first -read_only_relocs warning -lHSffi
-	-ghc -c --make hledger-chart/hledger-chart.hs $(MACRELEASEBUILDFLAGS) -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-chart/'`
-	-gcc -o bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-chart/'` -march=i686 -m32 hledger-chart/hledger-chart.o hledger-chart/Hledger/Chart/Main.o hledger/Hledger/Cli/Options.o hledger/Hledger/Cli/Utils.o hledger/Hledger/Cli/Version.o hledger-lib/Hledger/Data.o hledger-lib/Hledger/Data/Account.o hledger-lib/Hledger/Data/AccountName.o hledger-lib/Hledger/Data/Amount.o hledger-lib/Hledger/Data/Commodity.o hledger-lib/Hledger/Data/Dates.o hledger-lib/Hledger/Data/Transaction.o hledger-lib/Hledger/Data/Ledger.o hledger-lib/Hledger/Data/Journal.o hledger-lib/Hledger/Data/Posting.o hledger-lib/Hledger/Data/TimeLog.o hledger-lib/Hledger/Data/Types.o hledger-lib/Hledger/Data/Utils.o hledger-lib/Hledger/Read.o hledger-lib/Hledger/Read/Utils.o hledger-lib/Hledger/Read/JournalReader.o hledger-lib/Hledger/Read/TimelogReader.o -L/usr/lib -L/Users/simon/.cabal/lib/utf8-string-0.3.6/ghc-6.12.3 -L/opt/local/lib -L/Users/simon/.cabal/lib/split-0.1.2/ghc-6.12.3 -L/usr/lib -L/Users/simon/.cabal/lib/safe-0.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/regexpr-0.5.1/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/process-1.0.1.3 -L/Users/simon/.cabal/lib/parsec-2.1.0.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/mtlparse-0.0.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/HUnit-1.2.2.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/Chart-0.14/ghc-6.12.3 -L/Users/simon/.cabal/lib/gtk-0.12.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/pango-0.12.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/gio-0.12.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/glib-0.12.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/data-accessor-template-0.2.1.5/ghc-6.12.3 -L/Users/simon/.cabal/lib/utility-ht-0.0.5.1/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/base-3.0.3.2 -L/usr/local/lib/ghc-6.12.3/syb-0.1.0.2 -L/usr/local/lib/ghc-6.12.3/template-haskell-2.4.0.1 -L/usr/local/lib/ghc-6.12.3/pretty-1.0.1.1 -L/Users/simon/.cabal/lib/data-accessor-0.2.1.4/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/containers-0.3.0.0 -L/Users/simon/.cabal/lib/colour-2.3.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/cairo-0.12.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/mtl-2.0.1.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/transformers-0.2.2.0/ghc-6.12.3 -L/Users/simon/.cabal/lib/haskell98-1.0.1.1/ghc-6.12.3 -L/Users/simon/.cabal/lib/random-1.0.0.2/ghc-6.12.3 -L/Users/simon/.cabal/lib/time-1.2.0.3/ghc-6.12.3 -L/Users/simon/.cabal/lib/process-1.0.1.4/ghc-6.12.3 -L/usr/local/lib/ghc-6.12.3/directory-1.0.1.1 -L/usr/local/lib/ghc-6.12.3/unix-2.4.0.2 -L/usr/local/lib/ghc-6.12.3/old-time-1.0.0.5 -L/usr/local/lib/ghc-6.12.3/old-locale-1.0.0.2 -L/usr/local/lib/ghc-6.12.3/filepath-1.1.0.4 -L/usr/local/lib/ghc-6.12.3/bytestring-0.9.1.7 -L/usr/local/lib/ghc-6.12.3/array-0.3.0.1 -L/usr/local/lib/ghc-6.12.3/base-4.2.0.2 -L/usr/local/lib/ghc-6.12.3/integer-gmp-0.2.0.1 -L/usr/local/lib/ghc-6.12.3/ghc-prim-0.2.0.0 -L/usr/local/lib/ghc-6.12.3 -lHSrtsmain -lHSutf8-string-0.3.6 -lHSsplit-0.1.2 -lHSsafe-0.2 -lHSregexpr-0.5.1 -lHSprocess-1.0.1.3 -lHSparsec-2.1.0.1 -lHSmtlparse-0.0.1 -lHSHUnit-1.2.2.1 -lHSChart-0.14 -lHSgtk-0.12.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangocairo-1.0 -lXinerama -lXi -lXrandr -lXcursor -lXcomposite -lXdamage -lgdk_pixbuf-2.0 -lpangoft2-1.0 -lgio-2.0 -lXext -lXfixes -lcairo -lpixman-1 -lXrender -lX11 -lxcb -lXau -lXdmcp -lpng12 -lpango-1.0 -lm -lfontconfig -lexpat -lfreetype -lz -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv -lHSpango-0.12.0 -lpangocairo-1.0 -lcairo -lpangoft2-1.0 -lpixman-1 -lpng12 -lXrender -lX11 -lxcb -lXau -lXdmcp -lpango-1.0 -lm -lfontconfig -lexpat -lfreetype -lz -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv -lHSgio-0.12.0 -lgio-2.0 -lz -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv -lHSglib-0.12.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv -lHSdata-accessor-template-0.2.1.5 -lHSutility-ht-0.0.5.1 -lHSbase-3.0.3.2 -lHSsyb-0.1.0.2 -lHStemplate-haskell-2.4.0.1 -lHSpretty-1.0.1.1 -lHSdata-accessor-0.2.1.4 -lHScontainers-0.3.0.0 -lHScolour-2.3.1 -lHScairo-0.12.0 -lcairo -lgobject-2.0 -lpixman-1 -lfontconfig -lexpat -lfreetype -lpng12 -lz -lXrender -lgthread-2.0 -lglib-2.0 -lintl -liconv -lX11 -lxcb -lXau -lXdmcp -lHSmtl-2.0.1.0 -lHStransformers-0.2.2.0 -lHShaskell98-1.0.1.1 -lHSrandom-1.0.0.2 -lHStime-1.2.0.3 -lHSprocess-1.0.1.4 -lHSdirectory-1.0.1.1 -lHSunix-2.4.0.2 -ldl -lHSold-time-1.0.0.5 -lHSold-locale-1.0.0.2 -lHSfilepath-1.1.0.4 -lHSbytestring-0.9.1.7 -lHSarray-0.3.0.1 -lHSbase-4.2.0.2 -liconv -lHSinteger-gmp-0.2.0.1 -lHSghc-prim-0.2.0.0 -lHSrts -lm -ldl -u _ghczmprim_GHCziTypes_Izh_static_info -u _ghczmprim_GHCziTypes_Czh_static_info -u _ghczmprim_GHCziTypes_Fzh_static_info -u _ghczmprim_GHCziTypes_Dzh_static_info -u _base_GHCziPtr_Ptr_static_info -u _base_GHCziWord_Wzh_static_info -u _base_GHCziInt_I8zh_static_info -u _base_GHCziInt_I16zh_static_info -u _base_GHCziInt_I32zh_static_info -u _base_GHCziInt_I64zh_static_info -u _base_GHCziWord_W8zh_static_info -u _base_GHCziWord_W16zh_static_info -u _base_GHCziWord_W32zh_static_info -u _base_GHCziWord_W64zh_static_info -u _base_GHCziStable_StablePtr_static_info -u _ghczmprim_GHCziTypes_Izh_con_info -u _ghczmprim_GHCziTypes_Czh_con_info -u _ghczmprim_GHCziTypes_Fzh_con_info -u _ghczmprim_GHCziTypes_Dzh_con_info -u _base_GHCziPtr_Ptr_con_info -u _base_GHCziPtr_FunPtr_con_info -u _base_GHCziStable_StablePtr_con_info -u _ghczmprim_GHCziBool_False_closure -u _ghczmprim_GHCziBool_True_closure -u _base_GHCziPack_unpackCString_closure -u _base_GHCziIOziException_stackOverflow_closure -u _base_GHCziIOziException_heapOverflow_closure -u _base_ControlziExceptionziBase_nonTermination_closure -u _base_GHCziIOziException_blockedIndefinitelyOnMVar_closure -u _base_GHCziIOziException_blockedIndefinitelyOnSTM_closure -u _base_ControlziExceptionziBase_nestedAtomically_closure -u _base_GHCziWeak_runFinalizzerBatch_closure -u _base_GHCziTopHandler_runIO_closure -u _base_GHCziTopHandler_runNonIO_closure -u _base_GHCziConc_ensureIOManagerIsRunning_closure -u _base_GHCziConc_runSparks_closure -u _base_GHCziConc_runHandlers_closure -Wl,-search_paths_first -read_only_relocs warning -lHSffi
-	@echo 'Please check the binaries look portable, then make compressbinaries:'
+macbinaries:    macbinary-hledger \
+		macbinary-hledger-vty \
+		macbinary-hledger-web \
+		macbinary-hledger-chart
+	@echo 'Please check the binaries are portable, then make compressbinaries'
 	otool -L bin/*`arch`
 
-# build deployable binaries for windows, assuming cygwin tools are present
-hledgerwin: install
+# build a deployable mac binary for the specified hledger package, munging
+# the link command to use only standard osx libs.  Specifically we link
+# without the non-standard GMP framework, which causes no apparent harm.
+# Clunky, does the link twice.
+macbinary-%:
+	BINARY=`echo $(BINARYFILENAME) | sed -e 's/hledger/$*/'` ; \
+	LINKCMD=`ghc -v --make $*/$*.hs $(MACRELEASEBUILDFLAGS) -o bin/$$BINARY 2>&1 | egrep "bin/gcc.*bin/$$BINARY"` ; \
+	PORTABLELINKCMD=`echo $$LINKCMD | sed -e 's/ -framework GMP//'` ; \
+	echo $$PORTABLELINKCMD; $$PORTABLELINKCMD
+
+# Run this on a windows machine or in a wine session, and probably in a
+# separate copy of the repo (hledger-win).
+# Builds and gather deployable binaries for windows, if cygwin tools are
+# present and all packages are buildable. Otherwise, cabal install each
+# package and gather the binaries by hand.
+windowsbinaries: install
 	cp ~/.cabal/bin/hledger.exe bin/`echo $(BINARYFILENAME) | dos2unix`
 	-cp ~/.cabal/bin/hledger-web.exe bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-web/' | dos2unix`
 	-cp ~/.cabal/bin/hledger-vty.exe bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-vty/' | dos2unix`
 	-cp ~/.cabal/bin/hledger-chart.exe bin/`echo $(BINARYFILENAME) | sed -e 's/hledger/hledger-chart/' | dos2unix`
-	@echo 'Please check the binaries look portable, then zip them:'
+	@echo 'Please check the binaries are portable, then make compressbinaries'
 	ls -l bin/*`arch`
 
 compressbinaries:
-	gzip bin/*`arch`
+	cd bin; for f in *-windows-*.exe ; do echo zipping $$f; rm -f $$f.zip; zip $$f.zip $$f; done
+#	for f in bin/*-{linux,mac-}* ; do echo gzipping $$f; gzip -q $$f >$$f.gz; done
+#	gzip bin/*`arch`
+
+# gzip-%:
+# 	gzip $* >$*.gz
+
+# zip-%:
+# 	zip $*.zip $*
 
 ######################################################################
 # TESTING
@@ -740,7 +754,7 @@ send:
 	darcs send http://joyful.com/repos/hledger --to=hledger@googlegroups.com --edit-description  
 
 # push patches and anything else pending to the public server
-push: pushprofs pushbinary
+push: pushprofs # pushlatestbinary
 	darcs push simon@joyful.com:/repos/hledger
 
 # pull anything pending from the public server
@@ -764,7 +778,7 @@ compressbinarywin:
 	cd bin; zip -9 $(BINARYFILENAME).zip $(BINARYFILENAME)
 
 # push the last-updated platform binary to the public download directory
-pushbinary:
+pushlatestbinary:
 	cd bin; rsync -aP `ls -t | head -1` simon@joyful.com:/repos/hledger/site/download/