From 0b160fade5ef471c9b429102c91e2ed639ea4ecd Mon Sep 17 00:00:00 2001 From: Nathaniel Wesley Filardo Date: Sat, 1 Mar 2014 21:57:52 -0500 Subject: [PATCH] More small tweaks to build system --- Makefile | 4 ++++ dyna.cabal | 1 - misc/dyna-doctest.py | 0 3 files changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 misc/dyna-doctest.py diff --git a/Makefile b/Makefile index 4d0fca0..5c8fa6c 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ $(VERFILE): echo "Build date:" `date` >> $@ echo "Commit: https://github.com/nwf/dyna/commit/"`git rev-parse HEAD` >> $@ +.PHONY: upstream upstream: git submodule update --init # git submodule update external/ekmett-parsers external/ekmett-trifecta @@ -18,15 +19,18 @@ upstream: # external/ekmett-parsers external/ekmett-trifecta . # cabal install --user external/ekmett-parsers external/ekmett-trifecta +.PHONY: deps deps: alex --version 2>/dev/null >/dev/null || cabal install alex happy --version 2>/dev/null >/dev/null || cabal install happy cabal install --user --enable-tests --only-dependencies . +.PHONY: build build: $(VERFILE) cabal configure --user cabal build +.PHONY: test tests test tests: cabal configure --user --enable-tests cabal build diff --git a/dyna.cabal b/dyna.cabal index 4e3235b..aec6a05 100644 --- a/dyna.cabal +++ b/dyna.cabal @@ -106,7 +106,6 @@ Executable dyna charset >=0.3, containers >=0.4, either >= 3.4, - haskeline >=0.6, ghc-prim, HUnit >=1.2, mtl >=2.1, diff --git a/misc/dyna-doctest.py b/misc/dyna-doctest.py old mode 100644 new mode 100755 -- 2.50.1