More small tweaks to build system

diff --git a/Makefile b/Makefile
index 4d0fca0e308f25130703dbe701286ebc38a17b6a..5c8fa6ce683a7e7aad9a57000383f9e97d9af0cc 100644 (file)
--- 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 4e3235beadfb6703e0af393ef77a80fb31fab099..aec6a05c08194d3b569f236ab67bf8ab4ccd6f3b 100644 (file)
--- 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 (file)
new mode 100755 (executable)