on master help sign in
Merge pull request #255 from ertes/master

Improved Makefile dependencies

commit424e37cf199c20ba7ed5191cd07decbac6540fe1 authorEdwin Brady <edwin.brady@gmail.com> dateThu 21 Mar 2013, 09:59 (14 years ago) parentc3dcf56b1890e7
2 files changed+15−13
.gitignore+1 Makefile+14−13
.gitignore+1
@@ -5,6 +5,7 @@ cabal-dev/
55*.a
66*.swp
77*~
8+custom.mk
89test/output
910test/test???/output
1011test/reg???/output
Makefile+14−13
@@ -1,32 +1,33 @@
1+.PHONY: build configure doc install linecount nodefault pinstall relib test
2+
13include config.mk
4+-include custom.mk
25
3−install: .PHONY
6+install:
47 $(CABAL) install $(CABALFLAGS)
58
6−pinstall: .PHONY
7− $(CABAL) configure --enable-executable-profiling $(CABALFLAGS)
8− $(CABAL) install --enable-executable-profiling $(CABALFLAGS)
9+pinstall: CABALFLAGS += --enable-executable-profiling
10+pinstall: dist/setup-config
11+ $(CABAL) install $(CABALFLAGS)
912
10−build: .PHONY
13+build: dist/setup-config
1114 $(CABAL) build $(CABALFLAGS)
1215
13−configure: .PHONY
14− $(CABAL) configure $(CABALFLAGS)
15−
16−test : .PHONY
16+test:
1717 make -C test
1818
19−relib: .PHONY
19+relib:
2020 make -C lib IDRIS=../dist/build/idris/idris clean
2121 make -C effects IDRIS=../dist/build/idris/idris clean
2222 $(CABAL) install $(CABALFLAGS)
2323
24−linecount : .PHONY
24+linecount:
2525 wc -l src/Idris/*.hs src/Core/*.hs src/IRTS/*.hs src/Pkg/*.hs
2626
2727#Note: this doesn't yet link to Hackage properly
28−doc: .PHONY
28+doc: dist/setup-config
2929 $(CABAL) haddock --executables --hyperlink-source --html --hoogle --html-location="http://hackage.haskell.org/packages/archive/\$$pkg/latest/doc/html" --haddock-options="--title Idris"
3030
31−.PHONY:
3231
32+dist/setup-config:
33+ $(CABAL) configure $(CABALFLAGS)