summaryrefslogtreecommitdiff
path: root/asm/Makefile
diff options
context:
space:
mode:
authorAlex AUVOLAT <alex.auvolat@ens.fr>2014-01-08 18:33:54 +0100
committerAlex AUVOLAT <alex.auvolat@ens.fr>2014-01-08 18:33:54 +0100
commit2ab6a18d17e0f16f359feafc582f2ff732f34492 (patch)
treea14e83560b4b577313f9ef2fe3f9c0be5220ef0a /asm/Makefile
parentb2c5356b3f6d2e0a836a19b4cae1791d350785d3 (diff)
parente07508129a81605f77ee410ef4db104a96fc44bf (diff)
downloadSystDigit-Projet-2ab6a18d17e0f16f359feafc582f2ff732f34492.tar.gz
SystDigit-Projet-2ab6a18d17e0f16f359feafc582f2ff732f34492.zip
Merge branch 'integration-progressive'
Conflicts: asm/asm.ml asm/asmlex.mll asm/asmpars.mly asm/assembler.ml
Diffstat (limited to 'asm/Makefile')
-rw-r--r--asm/Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/asm/Makefile b/asm/Makefile
new file mode 100644
index 0000000..8ac2004
--- /dev/null
+++ b/asm/Makefile
@@ -0,0 +1,10 @@
+
+all: asm
+
+asm: assembler.ml asm.ml asmlex.mll asmpars.mly
+ ocamlbuild assembler.native
+ mv assembler.native asm
+
+clean:
+ rm asm
+ rm -r _build