Merge pull request #44 from hannesm/fix-deps

freestanding: describe dependencies appropriately, don't copy header files

dune-project

@@ -1,4 +1,4 @@
-(lang dune 2.7)
+(lang dune 2.6)
 (name hacl_x25519)
 (generate_opam_files true)
 (source (github mirage/hacl))

freestanding/Makefile

@@ -11,7 +11,7 @@ libhacl_x25519_freestanding_stubs.a:
 else
 CC ?= cc
 FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)
-CFLAGS := -O3 -I../src/kremlin/include -I../src/kremlin/kremlib/dist/minimal -DKRML_HOST_TIME $(FREESTANDING_CFLAGS)
+CFLAGS := -O3 -I../src/kremlin/include -I../src/kremlin/kremlib/dist/minimal -I../src -DKRML_HOST_TIME $(FREESTANDING_CFLAGS)
 
 OBJS=hacl_x25519_stubs.o Hacl_Hash.o Hacl_Curve25519_51.o Hacl_Ed25519.o
 

freestanding/dune

@@ -1,13 +1,8 @@
-(copy_files#
- (alias install)
- (files ../src/*.c))
-
-(copy_files#
- (alias install)
- (files ../src/*.h))
+(copy_files# ../src/*.c)
 
 (rule
- (deps Makefile)
+ (deps Makefile hacl_x25519_stubs.c Hacl_Hash.c Hacl_Curve25519_51.c
+   Hacl_Ed25519.c)
  (targets libhacl_x25519_freestanding_stubs.a)
  (action
   (no-infer

hacl_x25519.opam

@@ -18,7 +18,7 @@ homepage: "https://github.com/mirage/hacl"
 doc: "https://mirage.github.io/hacl/doc"
 bug-reports: "https://github.com/mirage/hacl/issues"
 depends: [
-  "dune" {>= "2.7"}
+  "dune" {>= "2.6"}
   "benchmark" {with-test}
   "cstruct" {>= "3.5.0"}
   "eqaf"
@@ -30,15 +30,14 @@ depends: [
   "ppx_deriving_yojson" {with-test}
   "stdlib-shims" {with-test}
   "yojson" {with-test & >= "1.6.0"}
-  "odoc" {with-doc}
 ]
 depopts: ["ocaml-freestanding"]
 conflicts: [
   "mirage-xen" {< "6.0.0"}
   "ocaml-freestanding" {< "0.6.0"}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst"] {pinned}
   [
     "dune"
     "build"