diff --git a/src/Makefile b/src/Makefile index 6ea187181..5b2770777 100644 --- a/src/Makefile +++ b/src/Makefile @@ -190,11 +190,11 @@ partial-clean:: -rm -f proto/*.cm* proto/*.a node.top: DEVFLAGS= -node.top: ${MINUTILS_LIB_IMPLS} ${UTILS_LIB_IMPLS} ${COMPILER_LIB_IMPLS} ${FULL_NODE_LIB_IMPLS} +node.top: ${MINUTILS_LIB_IMPLS} ${UTILS_LIB_IMPLS} ${COMPILER_LIB_IMPLS} ${NODE_LIB_IMPLS} ( $(patsubst %, echo "#require \"%\";;" ; ,${NODE_PACKAGES}) ) > .ocamlinit.node ( $(patsubst %, echo "#mod_use \"%\";;" ; ,${MINUTILS_LIB_IMPLS} ${UTILS_LIB_IMPLS}) ) >> .ocamlinit.node ( $(patsubst %, echo "open %;;" ; ,${NODE_OPENED_MODULES}) ) >> .ocamlinit.node - ( $(patsubst %, echo "#mod_use \"%\";;" ; ,${COMPILER_LIB_IMPLS} ${FULL_NODE_LIB_IMPLS}) ) >> .ocamlinit.node + ( $(patsubst %, echo "#mod_use \"%\";;" ; ,${COMPILER_LIB_IMPLS} ${NODE_LIB_IMPLS}) ) >> .ocamlinit.node utop -I +compiler-libs ocamlcommon.cma -init .ocamlinit.node ${UTOPFLAGS} ## HACK: the explicit loading of `ocamlcommon.cma` is here to ## circumvent a bug in utop. https://github.com/diml/utop/issues/213 diff --git a/src/Makefile.files b/src/Makefile.files index 339ca4763..ef88f56c0 100644 --- a/src/Makefile.files +++ b/src/Makefile.files @@ -219,9 +219,7 @@ NODE_LIB_INTFS := \ node/db/persist.mli \ node/db/context.mli \ \ - node/db/store_sigs.mli \ node/db/raw_store.mli \ - node/db/store_sigs.mli \ node/db/store_helpers.mli \ node/db/store.mli \ \ @@ -243,8 +241,7 @@ NODE_LIB_INTFS := \ node/shell/node.mli \ node/shell/node_rpc.mli \ -# this includes single .mli for `node.top` -FULL_NODE_LIB_IMPLS := \ +NODE_LIB_IMPLS := \ \ compiler/node_compiler_main.ml \ \ @@ -264,7 +261,7 @@ FULL_NODE_LIB_IMPLS := \ node/db/context.ml \ \ node/db/raw_store.ml \ - node/db/store_sigs.mli \ + node/db/store_sigs.ml \ node/db/store_helpers.ml \ node/db/store.ml \ \ @@ -287,9 +284,6 @@ FULL_NODE_LIB_IMPLS := \ node/shell/node.ml \ node/shell/node_rpc.ml \ -# this only includes .ml -NODE_LIB_IMPLS := $(filter-out ${NODE_LIB_INTFS}, ${FULL_NODE_LIB_IMPLS}) - NODE_INTFS := \ node/main/node_identity_file.mli \ node/main/node_config_file.mli \ diff --git a/src/node/db/store_sigs.mli b/src/node/db/store_sigs.ml similarity index 100% rename from src/node/db/store_sigs.mli rename to src/node/db/store_sigs.ml