Merge pull request #64 from dagit/master
Configure makefile using config.mk
commite3aeee93a269005d7003cbc6be143504b112afe4
authorEdwin Brady <edwin.brady@gmail.com>
dateTue 30 Oct 2012, 11:15 (14 years ago)
parentbba84d5b8fc54e
.travis.yml+4−1
@@ -1 +1,4 @@
1−language: Haskell
1+language: haskell
2+script:
3+ - cd test
4+ - ./runtest.pl all
Makefile+7−5
@@ -1,15 +1,17 @@
1+include config.mk
2+
13install: .PHONY
2− cabal install
4+ $(CABAL) install
35
46pinstall: .PHONY
5− cabal configure --enable-executable-profiling
6− cabal install --enable-executable-profiling
7+ $(CABAL) configure --enable-executable-profiling
8+ $(CABAL) install --enable-executable-profiling
79
810build: .PHONY
9− cabal build
11+ $(CABAL) build
1012
1113configure: .PHONY
12− cabal configure
14+ $(CABAL) configure
1315
1416test : .PHONY
1517 make -C test
README+2
@@ -1,5 +1,7 @@
11Idris (http://idris-lang.org/) is an experimental functional programming
22language with dependent types.
33
4+To configure, edit config.mk. The default values should work for most people.
5+
46To install, type 'make'. This will install everything using cabal and
57typecheck the libraries.
config.mknew file+3
@@ -0,0 +1,3 @@
1+GMP_INCLUDE_DIR :=
2+CC :=gcc
3+CABAL :=cabal
rts/Makefile+5
@@ -1,6 +1,11 @@
1+include ../config.mk
2+
13OBJS = idris_rts.o idris_gc.o idris_gmp.o idris_stdfgn.o
24HDRS = idris_rts.h idris_gc.h idris_gmp.h idris_stdfgn.h
35CFLAGS = -O2 -Wall -Werror
6+ifneq ($(GMP_INCLUDE_DIR),)
7+ CFLAGS += -isystem $(GMP_INCLUDE_DIR)
8+endif
49
510LIBTARGET = libidris_rts.a
611