diff options
| author | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-05 21:58:15 +0100 |
|---|---|---|
| committer | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-05 21:58:15 +0100 |
| commit | 7e880634a685c685d137ba2625ce341262e5a8e0 (patch) | |
| tree | 00edfc1235aa8a1a262b613deec4474c5d056b70 | |
| parent | 3a00cee584580529c43b8c17376cc7aaacc81e4c (diff) | |
| parent | 93975bf86887d997f49705b8535c896bc9130467 (diff) | |
| download | LPC-Projet-7e880634a685c685d137ba2625ce341262e5a8e0.tar.gz LPC-Projet-7e880634a685c685d137ba2625ce341262e5a8e0.zip | |
Merge branch 'master' into codegen-alex-opt
Conflicts:
src/Makefile
| -rw-r--r-- | src/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 40eee1b..619fac9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,9 +4,8 @@ all: $(BIN) $(BIN): main.ml ast.ml parser.mly lexer.mll pretty.ml typing.ml pretty_typing.ml codegen.ml ocamlbuild main.native - mv main.native minic++ + mv main.native $(BIN) clean: rm -r _build - rm main.byte rm $(BIN) |