Merged src/dune

Makefile

@@ -15,14 +15,6 @@ build:
 install: all
 	dune b @install --profile=release
 	dune    install --profile=release
-	$(MKDIR) -p `opam var share`/Lama/x64
-	$(INSTALL) $(shell ls _build/default/stdlib/x64/*.[oi] _build/default/stdlib/x64/stdlib/*.lama \
-		runtime/runtime.a runtime/Std.i) \
-		`opam var share`/Lama/x64
-	$(MKDIR) -p `opam var share`/Lama/x32
-	$(INSTALL) $(shell ls _build/default/stdlib/x32/*.[oi] _build/default/stdlib/x32/stdlib/*.lama \
-		runtime32/runtime.a runtime32/Std.i) \
-		`opam var share`/Lama/x32
 
 _build/default/Lama.install: 
 	dune b @install

dune-project

@@ -1,4 +1,6 @@
-(lang dune 3.3)
+(lang dune 3.11)
+
+(name Lama)
 
 (cram enable)
 

runtime/dune

@@ -5,3 +5,9 @@
  (deps Makefile gc.c gc.h runtime_common.h runtime.c runtime.h printf.S)
  (action
   (run make)))
+
+(install
+ (section share)
+ (files
+  (runtime.a as x64/runtime.a)
+  (Std.i as x64/Std.i)))

runtime32/dune

@@ -7,3 +7,9 @@
  (deps Makefile gc_runtime.s runtime.c runtime.h)
  (action
   (run make -j2)))
+
+(install
+ (section share)
+ (files
+  (runtime.a as x32/runtime.a)
+  (Std.i as x32/Std.i)))

stdlib/dune

@@ -0,0 +1,5 @@
+(install
+ (section share)
+ (files
+  (glob_files (*.lama with_prefix x64))
+  (glob_files (*.lama with_prefix x32))))

stdlib/x32/dune

@@ -60,3 +60,8 @@
       LAMAC
       "../../src/Driver.exe -32 -I ../../runtime32"
       (run make -j2 -f ../Makefile all)))))))
+(install
+ (section share)
+ (files
+  (glob_files (*.i with_prefix x32))
+  (glob_files (*.o with_prefix x32))))

stdlib/x64/dune

@@ -57,3 +57,9 @@
       LAMAC
       "../../src/Driver.exe -64 -I ../../runtime"
       (run make -j2 -f ../Makefile all)))))))
+
+(install
+ (section share)
+ (files
+  (glob_files (*.i with_prefix x64))
+  (glob_files (*.o with_prefix x64))))