diff --git a/ocamltest/dune b/ocamltest/dune index ff6cb8308..36a44a2e2 100644 --- a/ocamltest/dune +++ b/ocamltest/dune @@ -22,9 +22,11 @@ (rule (targets ocamltest_config.ml) - (deps ../Makefile.config ../Makefile.common ../Makefile.best_binaries Makefile + (deps ../Makefile.config ../Makefile.build_config + ../Makefile.common ../Makefile.best_binaries + Makefile ./ocamltest_config.ml.in ./getocamloptdefaultflags) - (action (run make %{targets}))) + (action (run make %{targets} COMPUTE_DEPS=false))) ;; FIXME: handle UNIX_OR_WIN32 or something similar (library diff --git a/runtime/dune b/runtime/dune index 4b9c50af1..6d1e5f9d1 100644 --- a/runtime/dune +++ b/runtime/dune @@ -16,28 +16,32 @@ (targets primitives) (mode fallback) (deps alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c intern.c - interp.c ints.c io.c lexing.c md5.c meta.c obj.c parsing.c signals.c - str.c sys.c callback.c weak.c finalise.c stacks.c dynlink.c - backtrace_byt.c backtrace.c spacetime_byt.c afl.c bigarray.c) + interp.c ints.c io.c + lexing.c md5.c meta.c memprof.c obj.c parsing.c signals.c str.c sys.c + callback.c weak.c + finalise.c stacks.c dynlink.c backtrace_byt.c backtrace.c + spacetime_byt.c afl.c + bigarray.c eventlog.c) (action (with-stdout-to %{targets} (run %{dep:gen_primitives.sh})))) (rule (targets libcamlrun.a) (mode fallback) - (deps ../Makefile.config ../Makefile.common Makefile + (deps ../Makefile.config ../Makefile.build_config + ../Makefile.common Makefile (glob_files caml/*.h) interp.c misc.c stacks.c fix_code.c startup_aux.c startup_byt.c freelist.c major_gc.c minor_gc.c memory.c alloc.c roots_byt.c globroots.c fail_byt.c signals.c signals_byt.c printexc.c backtrace_byt.c backtrace.c compare.c ints.c floats.c str.c array.c - io.c extern.c intern.c hash.c sys.c meta.c parsing.c gc_ctrl.c md5.c - obj.c lexing.c callback.c debugger.c weak.c compact.c finalise.c + io.c extern.c intern.c hash.c sys.c meta.c parsing.c gc_ctrl.c eventlog.c + md5.c obj.c lexing.c callback.c debugger.c weak.c compact.c finalise.c custom.c dynlink.c spacetime_byt.c afl.c unix.c win32.c bigarray.c main.c memprof.c domain.c) (action (progn (bash "touch .depend") ; hack. - (run make %{targets}) + (run make %{targets} COMPUTE_DEPS=false) (bash "rm .depend")))) ;; HACK diff --git a/utils/dune b/utils/dune index 39c76af33..de234e73a 100644 --- a/utils/dune +++ b/utils/dune @@ -17,6 +17,7 @@ (mode fallback) (deps (:mk Makefile) ../Makefile.config + ; for now the utils Makefile does not use build_config config.mlp) (action (system "make -f %{mk} %{targets}")))