From bed066dbf1b6cf9d606c0f1f827cce30f4dcc430 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Thu, 20 Mar 2025 21:26:37 -0500
Subject: T7272: simplify library dependencies for implementation of commit op

---
 src/dune | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

(limited to 'src/dune')

diff --git a/src/dune b/src/dune
index c9a6eb6..63e1167 100644
--- a/src/dune
+++ b/src/dune
@@ -7,11 +7,24 @@
  (libraries lwt lwt.unix lwt_log lwt_ppx ocaml-protoc ocplib-endian)
  (preprocess (pps lwt_ppx)))
 
+(library
+ (name vycall_message)
+ (public_name vyconf.vycall-message)
+ (modules vycall_pbt)
+ (libraries ocaml-protoc))
+
+(library
+ (name commitd_client)
+ (public_name vyconf.vycall-client)
+ (modules vycall_client commit)
+ (libraries vyos1x-config vycall_message lwt lwt.unix lwt_log lwt_ppx ocplib-endian)
+ (preprocess (pps lwt_ppx)))
+
 (library
  (name vyconfd_config)
  (public_name vyconf.vyconfd-config)
- (modules vyconf_config startup session directories defaults commit)
- (libraries vyos1x-config vyconf_connect toml sha ppx_deriving.show yojson ppx_deriving_yojson)
+ (modules vyconf_config startup session directories defaults)
+ (libraries vyos1x-config vyconf_connect commitd_client toml sha ppx_deriving.show yojson ppx_deriving_yojson)
  (preprocess (pps lwt_ppx ppx_deriving.show ppx_deriving_yojson)))
 
 (library
@@ -21,19 +34,6 @@
  (libraries vyos1x-config vyconf_connect lwt lwt.unix lwt_log lwt_ppx)
  (preprocess (pps lwt_ppx)))
 
-(library
- (name vycall_message)
- (public_name vyconf.vycall-message)
- (modules vycall_pbt)
- (libraries ocaml-protoc))
-
-(library
- (name commitd_client)
- (public_name vyconf.vycall-client)
- (modules vycall_client)
- (libraries vyos1x-config vyconfd_config vycall_message lwt lwt.unix lwt_log lwt_ppx ocplib-endian)
- (preprocess (pps lwt_ppx)))
-
 (executable
  (name vyconfd)
  (public_name vyconfd)
@@ -54,13 +54,6 @@
  (modules validate)
  (libraries vyconfd_client))
 
-(executable
- (name test_commit_data)
- (public_name test-commit-data)
- (modules test_commit_data)
- (libraries vyos1x-config vyconfd_config)
- (preprocess (pps lwt_ppx)))
-
 (rule
  (mode promote)
  (targets vyconf_pbt.ml vyconf_pbt.mli)
-- 
cgit v1.2.3