debugger, ocamlbuild, ocamldoc: separate their build from the compiler's.HEADmaster

In other words: "make world" doesn't build the aforementioned tools
anymore and they need to be configured and built separately. They are still
in the same source tree.

At first sight this should lead to more work but there are _several_
reasons for such a split.

* It dissociates the builds and therefore the breakage when doing changes
in the build system.

* It makes changing one of them simpler.

* It simplifies the Makefile files and removes some needs for the
UNIX_OR_WIN32 variable.

* It removes the Makefile.nt files and enables the build of the manpages on
Windows too.

* It builds these tools using the .opt variants when possible. This doesn't
save that much time but it's nice nonetheless.

* It's simpler to package for distributions which already split these tools
to their own packages.

* It simplifies cross-compilation by reducing the scope of the changes
needed (i.e. I hope there won't be a need for more changes in the build
systems of these tools).

* It refers less to boot/ and should make bootstrapping at least a bit
simpler (I can't tell how much but in any case it's not negative).

As for the negative aspects:

* Possibly more steps for compiler hackers in the "hot path".

* A hand-written "configure_tool" script which creates a "Makefile.local"
file which is include'ed from the Makefile files and which defines the
invocation of the compiler and of other tools.

After these changes, there are two ways to build the tools: whether OCaml
is installed system-wide or not (i.e. "uninstalled" [ I'm not to be blamed
for this terminology ]).

If the compiler has been installed (typical for packagers):
  ./configure_tool debugger
  make -C debugger all

If the compiler has not been installed (probably typical for compiler devs
even though I'm not sure most don't disable the build of the tools when
doing their development):
  UNINSTALLED_OCAML_DESTDIR=$(pwd)/lapin UNINSTALLED_OCAML_PREFIX=/usr ./configure_tool debugger
  make -C debugger all

In the example directly above, UNINSTALLED_OCAML_PREFIX defaults to
"/usr/local" (the default for the compiler build too) and must match.
UNINSTALLED_OCAML_DESTDIR has no default and must be the same as the value
used for DESTDIR when running "make install DESTDIR=$(pwd)/lapin" for the
compiler. Providing an absolute path, while not mandatory, is saner.

Comments are welcome on how to make the whole process more handy for you
(yes, "you", the reader, whoever you are).

4 files changed, 186 insertions, 312 deletions

diff --git a/debugger/.depend b/debugger/.depend
index c9a56ac14..137d9a35f 100644
--- a/debugger/.depend
+++ b/debugger/.depend
@@ -1,215 +1,137 @@
-breakpoints.cmi : primitives.cmi ../bytecomp/instruct.cmi
+breakpoints.cmi : primitives.cmi
 checkpoints.cmi : primitives.cmi debugcom.cmi
 command_line.cmi :
 debugcom.cmi : primitives.cmi
 debugger_config.cmi :
-dynlink.cmi :
-eval.cmi : ../typing/types.cmi ../typing/path.cmi parser_aux.cmi \
-    ../parsing/longident.cmi ../bytecomp/instruct.cmi ../typing/ident.cmi \
-    ../typing/env.cmi debugcom.cmi
-events.cmi : ../bytecomp/instruct.cmi
+eval.cmi : parser_aux.cmi debugcom.cmi
+events.cmi :
 exec.cmi :
-frames.cmi : primitives.cmi ../bytecomp/instruct.cmi
+frames.cmi : primitives.cmi
 history.cmi :
 input_handling.cmi : primitives.cmi
 int64ops.cmi :
 lexer.cmi : parser.cmi
-loadprinter.cmi : ../parsing/longident.cmi dynlink.cmi
+loadprinter.cmi :
 parameters.cmi :
-parser_aux.cmi : primitives.cmi ../parsing/longident.cmi
-parser.cmi : parser_aux.cmi ../parsing/longident.cmi
-pattern_matching.cmi : ../typing/typedtree.cmi parser_aux.cmi debugcom.cmi
-pos.cmi : ../bytecomp/instruct.cmi
-primitives.cmi : $(UNIXDIR)/unix.cmi
-printval.cmi : ../typing/types.cmi ../typing/path.cmi parser_aux.cmi \
-    ../typing/env.cmi debugcom.cmi
+parser.cmi : parser_aux.cmi
+parser_aux.cmi : primitives.cmi
+pattern_matching.cmi : parser_aux.cmi debugcom.cmi
+pos.cmi :
+primitives.cmi :
+printval.cmi : parser_aux.cmi debugcom.cmi
 program_loading.cmi : primitives.cmi
 program_management.cmi :
 question.cmi :
-show_information.cmi : ../bytecomp/instruct.cmi
-show_source.cmi : ../bytecomp/instruct.cmi
+show_information.cmi :
+show_source.cmi :
 source.cmi :
-symbols.cmi : ../bytecomp/instruct.cmi
+symbols.cmi :
 time_travel.cmi : primitives.cmi
 trap_barrier.cmi :
-unix_tools.cmi : $(UNIXDIR)/unix.cmi
-breakpoints.cmo : symbols.cmi primitives.cmi pos.cmi \
-    ../bytecomp/instruct.cmi exec.cmi debugcom.cmi checkpoints.cmi \
-    breakpoints.cmi
-breakpoints.cmx : symbols.cmx primitives.cmx pos.cmx \
-    ../bytecomp/instruct.cmx exec.cmx debugcom.cmx checkpoints.cmx \
-    breakpoints.cmi
+unix_tools.cmi :
+breakpoints.cmo : symbols.cmi primitives.cmi pos.cmi exec.cmi debugcom.cmi \
+    checkpoints.cmi breakpoints.cmi
+breakpoints.cmx : symbols.cmx primitives.cmx pos.cmx exec.cmx debugcom.cmx \
+    checkpoints.cmx breakpoints.cmi
 checkpoints.cmo : primitives.cmi int64ops.cmi debugcom.cmi checkpoints.cmi
 checkpoints.cmx : primitives.cmx int64ops.cmx debugcom.cmx checkpoints.cmi
-command_line.cmo : unix_tools.cmi $(UNIXDIR)/unix.cmi \
-    ../typing/types.cmi time_travel.cmi symbols.cmi source.cmi \
+command_line.cmo : unix_tools.cmi time_travel.cmi symbols.cmi source.cmi \
     show_source.cmi show_information.cmi question.cmi program_management.cmi \
     program_loading.cmi printval.cmi primitives.cmi pos.cmi parser_aux.cmi \
-    parser.cmi parameters.cmi ../utils/misc.cmi ../parsing/longident.cmi \
-    ../parsing/location.cmi loadprinter.cmi lexer.cmi int64ops.cmi \
-    ../bytecomp/instruct.cmi input_handling.cmi history.cmi frames.cmi \
-    events.cmi eval.cmi ../typing/envaux.cmi ../typing/env.cmi \
-    debugger_config.cmi debugcom.cmi ../typing/ctype.cmi ../utils/config.cmi \
-    checkpoints.cmi breakpoints.cmi command_line.cmi
-command_line.cmx : unix_tools.cmx $(UNIXDIR)/unix.cmx \
-    ../typing/types.cmx time_travel.cmx symbols.cmx source.cmx \
+    parser.cmi parameters.cmi loadprinter.cmi lexer.cmi int64ops.cmi \
+    input_handling.cmi history.cmi frames.cmi events.cmi eval.cmi \
+    debugger_config.cmi debugcom.cmi checkpoints.cmi breakpoints.cmi \
+    command_line.cmi
+command_line.cmx : unix_tools.cmx time_travel.cmx symbols.cmx source.cmx \
     show_source.cmx show_information.cmx question.cmx program_management.cmx \
     program_loading.cmx printval.cmx primitives.cmx pos.cmx parser_aux.cmi \
-    parser.cmx parameters.cmx ../utils/misc.cmx ../parsing/longident.cmx \
-    ../parsing/location.cmx loadprinter.cmx lexer.cmx int64ops.cmx \
-    ../bytecomp/instruct.cmx input_handling.cmx history.cmx frames.cmx \
-    events.cmx eval.cmx ../typing/envaux.cmx ../typing/env.cmx \
-    debugger_config.cmx debugcom.cmx ../typing/ctype.cmx ../utils/config.cmx \
-    checkpoints.cmx breakpoints.cmx command_line.cmi
-debugcom.cmo : primitives.cmi ../utils/misc.cmi int64ops.cmi \
-    input_handling.cmi debugcom.cmi
-debugcom.cmx : primitives.cmx ../utils/misc.cmx int64ops.cmx \
-    input_handling.cmx debugcom.cmi
+    parser.cmx parameters.cmx loadprinter.cmx lexer.cmx int64ops.cmx \
+    input_handling.cmx history.cmx frames.cmx events.cmx eval.cmx \
+    debugger_config.cmx debugcom.cmx checkpoints.cmx breakpoints.cmx \
+    command_line.cmi
+debugcom.cmo : primitives.cmi int64ops.cmi input_handling.cmi debugcom.cmi
+debugcom.cmx : primitives.cmx int64ops.cmx input_handling.cmx debugcom.cmi
 debugger_config.cmo : int64ops.cmi debugger_config.cmi
 debugger_config.cmx : int64ops.cmx debugger_config.cmi
-dynlink.cmo : ../bytecomp/symtable.cmi ../bytecomp/opcodes.cmo \
-    ../utils/misc.cmi ../bytecomp/meta.cmi ../bytecomp/dll.cmi \
-    ../utils/consistbl.cmi ../utils/config.cmi ../bytecomp/cmo_format.cmi \
-    ../typing/cmi_format.cmi dynlink.cmi
-dynlink.cmx : ../bytecomp/symtable.cmx ../bytecomp/opcodes.cmx \
-    ../utils/misc.cmx ../bytecomp/meta.cmx ../bytecomp/dll.cmx \
-    ../utils/consistbl.cmx ../utils/config.cmx ../bytecomp/cmo_format.cmi \
-    ../typing/cmi_format.cmx dynlink.cmi
-eval.cmo : ../typing/types.cmi ../bytecomp/symtable.cmi ../typing/subst.cmi \
-    printval.cmi ../typing/printtyp.cmi ../typing/predef.cmi \
-    ../typing/path.cmi parser_aux.cmi ../utils/misc.cmi \
-    ../parsing/longident.cmi ../bytecomp/instruct.cmi ../typing/ident.cmi \
-    frames.cmi ../typing/env.cmi debugcom.cmi ../typing/ctype.cmi \
-    ../typing/btype.cmi eval.cmi
-eval.cmx : ../typing/types.cmx ../bytecomp/symtable.cmx ../typing/subst.cmx \
-    printval.cmx ../typing/printtyp.cmx ../typing/predef.cmx \
-    ../typing/path.cmx parser_aux.cmi ../utils/misc.cmx \
-    ../parsing/longident.cmx ../bytecomp/instruct.cmx ../typing/ident.cmx \
-    frames.cmx ../typing/env.cmx debugcom.cmx ../typing/ctype.cmx \
-    ../typing/btype.cmx eval.cmi
-events.cmo : ../parsing/location.cmi ../bytecomp/instruct.cmi events.cmi
-events.cmx : ../parsing/location.cmx ../bytecomp/instruct.cmx events.cmi
+eval.cmo : printval.cmi parser_aux.cmi frames.cmi debugcom.cmi eval.cmi
+eval.cmx : printval.cmx parser_aux.cmi frames.cmx debugcom.cmx eval.cmi
+events.cmo : events.cmi
+events.cmx : events.cmi
 exec.cmo : exec.cmi
 exec.cmx : exec.cmi
-frames.cmo : symbols.cmi ../utils/misc.cmi ../bytecomp/instruct.cmi \
-    events.cmi debugcom.cmi frames.cmi
-frames.cmx : symbols.cmx ../utils/misc.cmx ../bytecomp/instruct.cmx \
-    events.cmx debugcom.cmx frames.cmi
+frames.cmo : symbols.cmi events.cmi debugcom.cmi frames.cmi
+frames.cmx : symbols.cmx events.cmx debugcom.cmx frames.cmi
 history.cmo : primitives.cmi int64ops.cmi debugger_config.cmi \
     checkpoints.cmi history.cmi
 history.cmx : primitives.cmx int64ops.cmx debugger_config.cmx \
     checkpoints.cmx history.cmi
-input_handling.cmo : $(UNIXDIR)/unix.cmi primitives.cmi \
-    input_handling.cmi
-input_handling.cmx : $(UNIXDIR)/unix.cmx primitives.cmx \
-    input_handling.cmi
+input_handling.cmo : primitives.cmi input_handling.cmi
+input_handling.cmx : primitives.cmx input_handling.cmi
 int64ops.cmo : int64ops.cmi
 int64ops.cmx : int64ops.cmi
 lexer.cmo : parser.cmi lexer.cmi
 lexer.cmx : parser.cmx lexer.cmi
-loadprinter.cmo : ../typing/types.cmi ../bytecomp/symtable.cmi printval.cmi \
-    ../typing/printtyp.cmi ../typing/path.cmi ../utils/misc.cmi \
-    ../parsing/longident.cmi ../typing/ident.cmi ../typing/env.cmi \
-    dynlink.cmi ../typing/ctype.cmi ../utils/config.cmi loadprinter.cmi
-loadprinter.cmx : ../typing/types.cmx ../bytecomp/symtable.cmx printval.cmx \
-    ../typing/printtyp.cmx ../typing/path.cmx ../utils/misc.cmx \
-    ../parsing/longident.cmx ../typing/ident.cmx ../typing/env.cmx \
-    dynlink.cmx ../typing/ctype.cmx ../utils/config.cmx loadprinter.cmi
-main.cmo : unix_tools.cmi $(UNIXDIR)/unix.cmi time_travel.cmi \
-    show_information.cmi question.cmi program_management.cmi primitives.cmi \
-    parameters.cmi ../utils/misc.cmi input_handling.cmi frames.cmi exec.cmi \
-    ../typing/env.cmi debugger_config.cmi ../utils/config.cmi \
-    command_line.cmi ../typing/cmi_format.cmi ../utils/clflags.cmi \
-    checkpoints.cmi
-main.cmx : unix_tools.cmx $(UNIXDIR)/unix.cmx time_travel.cmx \
-    show_information.cmx question.cmx program_management.cmx primitives.cmx \
-    parameters.cmx ../utils/misc.cmx input_handling.cmx frames.cmx exec.cmx \
-    ../typing/env.cmx debugger_config.cmx ../utils/config.cmx \
-    command_line.cmx ../typing/cmi_format.cmx ../utils/clflags.cmx \
-    checkpoints.cmx
-parameters.cmo : primitives.cmi ../typing/envaux.cmi debugger_config.cmi \
-    ../utils/config.cmi parameters.cmi
-parameters.cmx : primitives.cmx ../typing/envaux.cmx debugger_config.cmx \
-    ../utils/config.cmx parameters.cmi
-parser.cmo : parser_aux.cmi ../parsing/longident.cmi int64ops.cmi \
-    input_handling.cmi parser.cmi
-parser.cmx : parser_aux.cmi ../parsing/longident.cmx int64ops.cmx \
-    input_handling.cmx parser.cmi
-pattern_matching.cmo : ../typing/typedtree.cmi parser_aux.cmi \
-    ../utils/misc.cmi debugger_config.cmi debugcom.cmi ../typing/ctype.cmi \
+loadprinter.cmo : printval.cmi loadprinter.cmi
+loadprinter.cmx : printval.cmx loadprinter.cmi
+main.cmo : unix_tools.cmi time_travel.cmi show_information.cmi question.cmi \
+    program_management.cmi primitives.cmi parameters.cmi input_handling.cmi \
+    frames.cmi exec.cmi debugger_config.cmi command_line.cmi checkpoints.cmi
+main.cmx : unix_tools.cmx time_travel.cmx show_information.cmx question.cmx \
+    program_management.cmx primitives.cmx parameters.cmx input_handling.cmx \
+    frames.cmx exec.cmx debugger_config.cmx command_line.cmx checkpoints.cmx
+parameters.cmo : primitives.cmi debugger_config.cmi parameters.cmi
+parameters.cmx : primitives.cmx debugger_config.cmx parameters.cmi
+parser.cmo : parser_aux.cmi int64ops.cmi input_handling.cmi parser.cmi
+parser.cmx : parser_aux.cmi int64ops.cmx input_handling.cmx parser.cmi
+pattern_matching.cmo : parser_aux.cmi debugger_config.cmi debugcom.cmi \
     pattern_matching.cmi
-pattern_matching.cmx : ../typing/typedtree.cmx parser_aux.cmi \
-    ../utils/misc.cmx debugger_config.cmx debugcom.cmx ../typing/ctype.cmx \
+pattern_matching.cmx : parser_aux.cmi debugger_config.cmx debugcom.cmx \
     pattern_matching.cmi
-pos.cmo : source.cmi primitives.cmi ../parsing/location.cmi \
-    ../bytecomp/instruct.cmi pos.cmi
-pos.cmx : source.cmx primitives.cmx ../parsing/location.cmx \
-    ../bytecomp/instruct.cmx pos.cmi
-primitives.cmo : $(UNIXDIR)/unix.cmi primitives.cmi
-primitives.cmx : $(UNIXDIR)/unix.cmx primitives.cmi
-printval.cmo : ../typing/types.cmi ../bytecomp/symtable.cmi \
-    ../typing/printtyp.cmi ../typing/path.cmi parser_aux.cmi \
-    ../typing/outcometree.cmi ../typing/oprint.cmi \
-    ../toplevel/genprintval.cmi debugcom.cmi printval.cmi
-printval.cmx : ../typing/types.cmx ../bytecomp/symtable.cmx \
-    ../typing/printtyp.cmx ../typing/path.cmx parser_aux.cmi \
-    ../typing/outcometree.cmi ../typing/oprint.cmx \
-    ../toplevel/genprintval.cmx debugcom.cmx printval.cmi
-program_loading.cmo : unix_tools.cmi $(UNIXDIR)/unix.cmi \
-    primitives.cmi parameters.cmi input_handling.cmi debugger_config.cmi \
-    program_loading.cmi
-program_loading.cmx : unix_tools.cmx $(UNIXDIR)/unix.cmx \
-    primitives.cmx parameters.cmx input_handling.cmx debugger_config.cmx \
-    program_loading.cmi
-program_management.cmo : unix_tools.cmi $(UNIXDIR)/unix.cmi \
-    time_travel.cmi symbols.cmi question.cmi program_loading.cmi \
-    primitives.cmi parameters.cmi int64ops.cmi input_handling.cmi history.cmi \
-    ../typing/envaux.cmi debugger_config.cmi ../utils/config.cmi \
+pos.cmo : source.cmi primitives.cmi pos.cmi
+pos.cmx : source.cmx primitives.cmx pos.cmi
+primitives.cmo : primitives.cmi
+primitives.cmx : primitives.cmi
+printval.cmo : parser_aux.cmi debugcom.cmi printval.cmi
+printval.cmx : parser_aux.cmi debugcom.cmx printval.cmi
+program_loading.cmo : unix_tools.cmi primitives.cmi parameters.cmi \
+    input_handling.cmi debugger_config.cmi program_loading.cmi
+program_loading.cmx : unix_tools.cmx primitives.cmx parameters.cmx \
+    input_handling.cmx debugger_config.cmx program_loading.cmi
+program_management.cmo : unix_tools.cmi time_travel.cmi symbols.cmi \
+    question.cmi program_loading.cmi primitives.cmi parameters.cmi \
+    int64ops.cmi input_handling.cmi history.cmi debugger_config.cmi \
     breakpoints.cmi program_management.cmi
-program_management.cmx : unix_tools.cmx $(UNIXDIR)/unix.cmx \
-    time_travel.cmx symbols.cmx question.cmx program_loading.cmx \
-    primitives.cmx parameters.cmx int64ops.cmx input_handling.cmx history.cmx \
-    ../typing/envaux.cmx debugger_config.cmx ../utils/config.cmx \
+program_management.cmx : unix_tools.cmx time_travel.cmx symbols.cmx \
+    question.cmx program_loading.cmx primitives.cmx parameters.cmx \
+    int64ops.cmx input_handling.cmx history.cmx debugger_config.cmx \
     breakpoints.cmx program_management.cmi
 question.cmo : primitives.cmi lexer.cmi input_handling.cmi question.cmi
 question.cmx : primitives.cmx lexer.cmx input_handling.cmx question.cmi
 show_information.cmo : symbols.cmi source.cmi show_source.cmi printval.cmi \
-    parameters.cmi ../utils/misc.cmi ../bytecomp/instruct.cmi frames.cmi \
-    events.cmi debugcom.cmi checkpoints.cmi breakpoints.cmi \
-    show_information.cmi
+    parameters.cmi frames.cmi events.cmi debugcom.cmi checkpoints.cmi \
+    breakpoints.cmi show_information.cmi
 show_information.cmx : symbols.cmx source.cmx show_source.cmx printval.cmx \
-    parameters.cmx ../utils/misc.cmx ../bytecomp/instruct.cmx frames.cmx \
-    events.cmx debugcom.cmx checkpoints.cmx breakpoints.cmx \
-    show_information.cmi
-show_source.cmo : source.cmi primitives.cmi parameters.cmi \
-    ../parsing/location.cmi ../bytecomp/instruct.cmi events.cmi \
+    parameters.cmx frames.cmx events.cmx debugcom.cmx checkpoints.cmx \
+    breakpoints.cmx show_information.cmi
+show_source.cmo : source.cmi primitives.cmi parameters.cmi events.cmi \
     debugger_config.cmi show_source.cmi
-show_source.cmx : source.cmx primitives.cmx parameters.cmx \
-    ../parsing/location.cmx ../bytecomp/instruct.cmx events.cmx \
+show_source.cmx : source.cmx primitives.cmx parameters.cmx events.cmx \
     debugger_config.cmx show_source.cmi
-source.cmo : primitives.cmi ../utils/misc.cmi debugger_config.cmi \
-    ../utils/config.cmi source.cmi
-source.cmx : primitives.cmx ../utils/misc.cmx debugger_config.cmx \
-    ../utils/config.cmx source.cmi
-symbols.cmo : ../bytecomp/symtable.cmi program_loading.cmi \
-    ../bytecomp/instruct.cmi events.cmi debugger_config.cmi debugcom.cmi \
-    checkpoints.cmi ../bytecomp/bytesections.cmi symbols.cmi
-symbols.cmx : ../bytecomp/symtable.cmx program_loading.cmx \
-    ../bytecomp/instruct.cmx events.cmx debugger_config.cmx debugcom.cmx \
-    checkpoints.cmx ../bytecomp/bytesections.cmx symbols.cmi
+source.cmo : primitives.cmi debugger_config.cmi source.cmi
+source.cmx : primitives.cmx debugger_config.cmx source.cmi
+symbols.cmo : program_loading.cmi events.cmi debugger_config.cmi \
+    debugcom.cmi checkpoints.cmi symbols.cmi
+symbols.cmx : program_loading.cmx events.cmx debugger_config.cmx \
+    debugcom.cmx checkpoints.cmx symbols.cmi
 time_travel.cmo : trap_barrier.cmi symbols.cmi question.cmi \
-    program_loading.cmi primitives.cmi ../utils/misc.cmi int64ops.cmi \
-    ../bytecomp/instruct.cmi input_handling.cmi exec.cmi events.cmi \
-    debugger_config.cmi debugcom.cmi checkpoints.cmi breakpoints.cmi \
-    time_travel.cmi
+    program_loading.cmi primitives.cmi int64ops.cmi input_handling.cmi \
+    exec.cmi events.cmi debugger_config.cmi debugcom.cmi checkpoints.cmi \
+    breakpoints.cmi time_travel.cmi
 time_travel.cmx : trap_barrier.cmx symbols.cmx question.cmx \
-    program_loading.cmx primitives.cmx ../utils/misc.cmx int64ops.cmx \
-    ../bytecomp/instruct.cmx input_handling.cmx exec.cmx events.cmx \
-    debugger_config.cmx debugcom.cmx checkpoints.cmx breakpoints.cmx \
-    time_travel.cmi
+    program_loading.cmx primitives.cmx int64ops.cmx input_handling.cmx \
+    exec.cmx events.cmx debugger_config.cmx debugcom.cmx checkpoints.cmx \
+    breakpoints.cmx time_travel.cmi
 trap_barrier.cmo : exec.cmi debugcom.cmi checkpoints.cmi trap_barrier.cmi
 trap_barrier.cmx : exec.cmx debugcom.cmx checkpoints.cmx trap_barrier.cmi
-unix_tools.cmo : $(UNIXDIR)/unix.cmi primitives.cmi ../utils/misc.cmi \
-    unix_tools.cmi
-unix_tools.cmx : $(UNIXDIR)/unix.cmx primitives.cmx ../utils/misc.cmx \
-    unix_tools.cmi
+unix_tools.cmo : primitives.cmi unix_tools.cmi
+unix_tools.cmx : primitives.cmx unix_tools.cmi
diff --git a/debugger/Makefile b/debugger/Makefile
index 75f4aa8eb..fc0f59c40 100644
--- a/debugger/Makefile
+++ b/debugger/Makefile
@@ -10,5 +10,100 @@
 #                                                                       #
 #########################################################################
 
-UNIXDIR=../otherlibs/$(UNIXLIB)
-include Makefile.shared
+include Makefile.local
+
+ROOTDIR=..
+COMPFLAGS=-warn-error A -safe-string
+LINKFLAGS=-linkall
+YACCFLAGS=
+
+INSTALL_BINDIR=$(DESTDIR)$(BINDIR)
+
+OTHEROBJS=\
+  unix.cma \
+  misc.cmo config.cmo tbl.cmo \
+  clflags.cmo consistbl.cmo warnings.cmo \
+  location.cmo longident.cmo \
+  ast_helper.cmo ast_mapper.cmo \
+  ident.cmo path.cmo types.cmo \
+  btype.cmo primitive.cmo typedtree.cmo \
+  subst.cmo predef.cmo \
+  datarepr.cmo cmi_format.cmo env.cmo \
+  oprint.cmo \
+  ctype.cmo printtyp.cmo mtype.cmo \
+  envaux.cmo \
+  runtimedef.cmo bytesections.cmo \
+  dll.cmo meta.cmo symtable.cmo \
+  opcodes.cmo \
+  genprintval.cmo
+
+
+OBJS=\
+	int64ops.cmo \
+	primitives.cmo \
+	unix_tools.cmo \
+	debugger_config.cmo \
+	parameters.cmo \
+	lexer.cmo \
+	input_handling.cmo \
+	question.cmo \
+	debugcom.cmo \
+	exec.cmo \
+	source.cmo \
+	pos.cmo \
+	checkpoints.cmo \
+	events.cmo \
+	program_loading.cmo \
+	symbols.cmo \
+	breakpoints.cmo \
+	trap_barrier.cmo \
+	history.cmo \
+	printval.cmo \
+	show_source.cmo \
+	time_travel.cmo \
+	program_management.cmo \
+	frames.cmo \
+	eval.cmo \
+	show_information.cmo \
+	loadprinter.cmo \
+	parser.cmo \
+	command_line.cmo \
+	main.cmo
+
+all: ocamldebug$(EXE)
+
+ocamldebug$(EXE): $(OBJS)
+	$(OCAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) -linkall $(OTHEROBJS) dynlink.cma $(OBJS)
+
+install:
+	cp ocamldebug$(EXE) $(INSTALL_BINDIR)/ocamldebug$(EXE)
+
+clean::
+	rm -f ocamldebug$(EXE)
+	rm -f *.cmo *.cmi
+
+.SUFFIXES:
+.SUFFIXES: .ml .cmo .mli .cmi
+
+.ml.cmo:
+	$(OCAMLC) -c $(COMPFLAGS) $<
+
+.mli.cmi:
+	$(OCAMLC) -c $(COMPFLAGS) $<
+
+depend: beforedepend
+	$(OCAMLDEP) $(DEPFLAGS) *.mli *.ml > .depend
+
+lexer.ml: lexer.mll
+	$(OCAMLLEX) lexer.mll
+clean::
+	rm -f lexer.ml
+beforedepend:: lexer.ml
+
+parser.ml parser.mli: parser.mly
+	$(OCAMLYACC) parser.mly
+clean::
+	rm -f parser.ml parser.mli
+beforedepend:: parser.ml parser.mli
+
+include .depend
diff --git a/debugger/Makefile.nt b/debugger/Makefile.nt
deleted file mode 100644
index 4182c7c77..000000000
--- a/debugger/Makefile.nt
+++ /dev/null
@@ -1,14 +0,0 @@
-#########################################################################
-#                                                                       #
-#                                 OCaml                                 #
-#                                                                       #
-#            Xavier Leroy, projet Cristal, INRIA Rocquencourt           #
-#                                                                       #
-#   Copyright 1999 Institut National de Recherche en Informatique et    #
-#   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the Q Public License version 1.0.                #
-#                                                                       #
-#########################################################################
-
-UNIXDIR=../otherlibs/win32unix
-include Makefile.shared
diff --git a/debugger/Makefile.shared b/debugger/Makefile.shared
deleted file mode 100644
index fed1d26da..000000000
--- a/debugger/Makefile.shared
+++ /dev/null
@@ -1,129 +0,0 @@
-#########################################################################
-#                                                                       #
-#                                 OCaml                                 #
-#                                                                       #
-#            Xavier Leroy, projet Cristal, INRIA Rocquencourt           #
-#                                                                       #
-#   Copyright 1999 Institut National de Recherche en Informatique et    #
-#   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the Q Public License version 1.0.                #
-#                                                                       #
-#########################################################################
-
-include ../config/Makefile
-
-ROOTDIR=..
-CAMLC=$(ROOTDIR)/boot/ocamlrun $(ROOTDIR)/ocamlc -nostdlib -I $(ROOTDIR)/stdlib
-COMPFLAGS=-warn-error A -safe-string $(INCLUDES)
-LINKFLAGS=-linkall -I $(UNIXDIR)
-CAMLYACC=../boot/ocamlyacc
-YACCFLAGS=
-CAMLLEX=../boot/ocamlrun ../boot/ocamllex
-CAMLDEP=../boot/ocamlrun ../tools/ocamldep
-DEPFLAGS=$(INCLUDES)
-
-INSTALL_BINDIR=$(DESTDIR)$(BINDIR)
-
-INCLUDES=\
-  -I ../utils -I ../parsing -I ../typing -I ../bytecomp -I ../toplevel \
-  -I $(UNIXDIR)
-
-OTHEROBJS=\
-  $(UNIXDIR)/unix.cma \
-  ../utils/misc.cmo ../utils/config.cmo ../utils/tbl.cmo \
-  ../utils/clflags.cmo ../utils/consistbl.cmo ../utils/warnings.cmo \
-  ../parsing/location.cmo ../parsing/longident.cmo \
-  ../parsing/ast_helper.cmo ../parsing/ast_mapper.cmo \
-  ../typing/ident.cmo ../typing/path.cmo ../typing/types.cmo \
-  ../typing/btype.cmo ../typing/primitive.cmo ../typing/typedtree.cmo \
-  ../typing/subst.cmo ../typing/predef.cmo \
-  ../typing/datarepr.cmo ../typing/cmi_format.cmo ../typing/env.cmo \
-  ../typing/oprint.cmo \
-  ../typing/ctype.cmo ../typing/printtyp.cmo ../typing/mtype.cmo \
-  ../typing/envaux.cmo \
-  ../bytecomp/runtimedef.cmo ../bytecomp/bytesections.cmo \
-  ../bytecomp/dll.cmo ../bytecomp/meta.cmo ../bytecomp/symtable.cmo \
-  ../bytecomp/opcodes.cmo \
-  ../toplevel/genprintval.cmo
-
-
-OBJS=\
-	dynlink.cmo \
-	int64ops.cmo \
-	primitives.cmo \
-	unix_tools.cmo \
-	debugger_config.cmo \
-	parameters.cmo \
-	lexer.cmo \
-	input_handling.cmo \
-	question.cmo \
-	debugcom.cmo \
-	exec.cmo \
-	source.cmo \
-	pos.cmo \
-	checkpoints.cmo \
-	events.cmo \
-	program_loading.cmo \
-	symbols.cmo \
-	breakpoints.cmo \
-	trap_barrier.cmo \
-	history.cmo \
-	printval.cmo \
-	show_source.cmo \
-	time_travel.cmo \
-	program_management.cmo \
-	frames.cmo \
-	eval.cmo \
-	show_information.cmo \
-	loadprinter.cmo \
-	parser.cmo \
-	command_line.cmo \
-	main.cmo
-
-all: ocamldebug$(EXE)
-
-ocamldebug$(EXE): $(OBJS) $(OTHEROBJS)
-	$(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) -linkall $(OTHEROBJS) $(OBJS)
-
-install:
-	cp ocamldebug$(EXE) $(INSTALL_BINDIR)/ocamldebug$(EXE)
-
-clean::
-	rm -f ocamldebug$(EXE)
-	rm -f *.cmo *.cmi
-
-.SUFFIXES:
-.SUFFIXES: .ml .cmo .mli .cmi
-
-.ml.cmo:
-	$(CAMLC) -c $(COMPFLAGS) $<
-
-.mli.cmi:
-	$(CAMLC) -c $(COMPFLAGS) $<
-
-depend: beforedepend
-	$(CAMLDEP) $(DEPFLAGS) *.mli *.ml \
-	| sed -e 's,$(UNIXDIR)/,$$(UNIXDIR)/,' > .depend
-
-lexer.ml: lexer.mll
-	$(CAMLLEX) lexer.mll
-clean::
-	rm -f lexer.ml
-beforedepend:: lexer.ml
-
-parser.ml parser.mli: parser.mly
-	$(CAMLYACC) parser.mly
-clean::
-	rm -f parser.ml parser.mli
-beforedepend:: parser.ml parser.mli
-
-dynlink.ml: ../otherlibs/dynlink/dynlink.ml
-	grep -v 'REMOVE_ME for ../../debugger/dynlink.ml' \
-	     ../otherlibs/dynlink/dynlink.ml >dynlink.ml
-dynlink.mli: ../otherlibs/dynlink/dynlink.mli
-	cp ../otherlibs/dynlink/dynlink.mli .
-clean::
-	rm -f dynlink.ml dynlink.mli
-beforedepend:: dynlink.ml dynlink.mli
-
-include .depend