Ajout : Makefile : CABAL_FLAGS et CABAL_*_FLAGS

diff --git a/Makefile b/Makefile
index 6ccfe3ba00610292b4f82e6fe9379486627a309b..f87c1fd4a955cc7934b753d407afbf5057ac9a49 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,26 +6,26 @@ all: install
 ###
 install: cabal/install lib/install cli/install web/install
 cabal/install:
-       cabal update
-       cabal install -v cabal
+       cabal update $(CABAL_FLAGS) $(CABAL_UPDATE_FLAGS)
+       cabal install -v $(CABAL_FLAGS) $(CABAL_INSTALL_FLAGS) cabal
 .PHONY: lib cli web
 lib lib/install:
-       cabal install -v --force-reinstalls lib/hcompta-lib.cabal
+       cabal install -v --force-reinstalls $(CABAL_FLAGS) $(CABAL_INSTALL_FLAGS) lib/hcompta-lib.cabal
 cli cli/install:
-       cabal install -v --force-reinstalls cli/hcompta-cli.cabal
+       cabal install -v --force-reinstalls $(CABAL_FLAGS) $(CABAL_INSTALL_FLAGS) cli/hcompta-cli.cabal
 web web/install:
-       cabal install -v --force-reinstalls web/hcompta-web.cabal
+       cabal install -v --force-reinstalls $(CABAL_FLAGS) $(CABAL_INSTALL_FLAGS) web/hcompta-web.cabal
 
 #
 ##  test
 ###
 test: lib/test cli/test web/test
 lib/test:
-       (cd lib && cabal test --show-details=always)
+       (cd lib && cabal test --show-details=always $(CABAL_FLAGS) $(CABAL_TEST_FLAGS))
 cli/test:
-       (cd cli && cabal test --show-details=always)
+       (cd cli && cabal test --show-details=always $(CABAL_FLAGS) $(CABAL_TEST_FLAGS))
 web/test:
-       (cd web && cabal test --show-details=always)
+       (cd web && cabal test --show-details=always $(CABAL_FLAGS) $(CABAL_TEST_FLAGS))
 
 #
 ##  doc
@@ -33,10 +33,10 @@ web/test:
 .PHONY: doc
 doc: doc/xhtml lib/doc cli/doc web/doc
 lib/doc:
-       (cd lib && cabal haddock --hyperlink-source)
+       (cd lib && cabal haddock --hyperlink-source $(CABAL_FLAGS) $(CABAL_HADDOCK_FLAGS))
 cli/doc:
-       (cd cli && cabal haddock --hyperlink-source)
+       (cd cli && cabal haddock --hyperlink-source $(CABAL_FLAGS) $(CABAL_HADDOCK_FLAGS))
 web/doc:
-       (cd web && cabal haddock --hyperlink-source)
+       (cd web && cabal haddock --hyperlink-source $(CABAL_FLAGS) $(CABAL_HADDOCK_FLAGS))
 doc/%: .
        $(MAKE) -C doc $*