From 5fe830d7036d04ce58d1e702f9d8ec746e841afb Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 10 Dec 2010 22:00:42 +0000 Subject: [PATCH] tools: update linux binary building --- Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 62b81bbdc..6fec8fc17 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,6 @@ CABALFILES:= \ hledger/hledger.cabal \ hledger-*/*.cabal # DOCFILES:=README DOWNLOAD MANUAL DEVELOPMENT NEWS SCREENSHOTS CONTRIBUTORS -BINARYFILENAME=$(shell touch $(VERSIONHS); runhaskell -ihledger $(MAIN) --binary-filename) PATCHLEVEL:=$(shell expr `darcs changes --count --from-tag=\\\\\.` - 1) WARNINGS:=-W -fwarn-tabs #-fwarn-orphans -fwarn-simple-patterns -fwarn-monomorphism-restriction -fwarn-name-shadowing DEFINEFLAGS:= @@ -84,6 +83,9 @@ VERSIONSENSITIVEFILES=\ $(CABALFILES) \ hledger-web/.hledger/web/.version \ +#BINARYFILENAME=$(shell touch $(VERSIONHS); runhaskell -ihledger $(MAIN) --binary-filename) +RELEASEBINARYSUFFIX:=$(shell echo "-$(VERSION)-`uname`-`arch`" | tr '[:upper:]' '[:lower:]') + default: tag hledger ###################################################################### @@ -225,6 +227,13 @@ hledgerlinux: setversion @echo 'Please check the build looks portable (statically linked):' -file bin/$(BINARYFILENAME) +linuxbinary-%: + ghc --make $*/$*.hs -o bin/$*$(RELEASEBINARYSUFFIX) $(LINUXRELEASEBUILDFLAGS) + +# XXX link errors +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 hledgermac: setversion ghc --make $(MAIN) -o bin/$(BINARYFILENAME) $(BUILDFLAGS) -O2 # -optl-L/usr/lib