git.iko.soy/Idris-dev
on master help sign in
Merge pull request #255 from ertes/master
424e37cEdwin Brady
.gitignore+1
compare with master
unifiedsplit
@@ -5,6 +5,7 @@ cabal-dev/
5*.a
5*.a
6*.swp
6*.swp
7*~
7*~
8+custom.mk
8test/output
9test/output
9test/test???/output
10test/test???/output
10test/reg???/output
11test/reg???/output
Makefile+14−13
@@ -1,32 +1,33 @@
1+.PHONY: build configure doc install linecount nodefault pinstall relib test
2+
1include config.mk
3include config.mk
4+-include custom.mk
2
5
3−install: .PHONY
6+install:
4 $(CABAL) install $(CABALFLAGS)
7 $(CABAL) install $(CABALFLAGS)
5
8
6−pinstall: .PHONY
7− $(CABAL) configure --enable-executable-profiling $(CABALFLAGS)
9+pinstall: CABALFLAGS += --enable-executable-profiling
10+pinstall: dist/setup-config
8− $(CABAL) install --enable-executable-profiling $(CABALFLAGS)
11+ $(CABAL) install $(CABALFLAGS)
9
12
10−build: .PHONY
13+build: dist/setup-config
11 $(CABAL) build $(CABALFLAGS)
14 $(CABAL) build $(CABALFLAGS)
12
15
13−configure: .PHONY
14− $(CABAL) configure $(CABALFLAGS)
15−
16−test : .PHONY
16+test:
17 make -C test
17 make -C test
18
18
19−relib: .PHONY
19+relib:
20 make -C lib IDRIS=../dist/build/idris/idris clean
20 make -C lib IDRIS=../dist/build/idris/idris clean
21 make -C effects IDRIS=../dist/build/idris/idris clean
21 make -C effects IDRIS=../dist/build/idris/idris clean
22 $(CABAL) install $(CABALFLAGS)
22 $(CABAL) install $(CABALFLAGS)
23
23
24−linecount : .PHONY
24+linecount:
25 wc -l src/Idris/*.hs src/Core/*.hs src/IRTS/*.hs src/Pkg/*.hs
25 wc -l src/Idris/*.hs src/Core/*.hs src/IRTS/*.hs src/Pkg/*.hs
26
26
27#Note: this doesn't yet link to Hackage properly
27#Note: this doesn't yet link to Hackage properly
28−doc: .PHONY
28+doc: dist/setup-config
29 $(CABAL) haddock --executables --hyperlink-source --html --hoogle --html-location="http://hackage.haskell.org/packages/archive/\$$pkg/latest/doc/html" --haddock-options="--title Idris"
29 $(CABAL) haddock --executables --hyperlink-source --html --hoogle --html-location="http://hackage.haskell.org/packages/archive/\$$pkg/latest/doc/html" --haddock-options="--title Idris"
30
30
31−.PHONY:
32
31
32+dist/setup-config:
33+ $(CABAL) configure $(CABALFLAGS)