-OCAMLC = ocamlfind ocamlc -thread $(OCAMLOPTIONS) $(PREPROCOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt -thread $(OCAMLOPTIONS) $(PREPROCOPTIONS)
-OCAMLDEP = ocamlfind ocamldep $(PREPROCOPTIONS)
+OCAMLDEBUGOPTIONS = -g
+OCAMLFIND = ocamlfind
+OCAMLC = $(OCAMLFIND) ocamlc $(OCAMLDEBUGOPTIONS) $(OCAMLOPTIONS) $(PREPROCOPTIONS)
+OCAMLOPT = $(OCAMLFIND) opt $(OCAMLOPTIONS) $(PREPROCOPTIONS)
+OCAMLDEP = $(OCAMLFIND) ocamldep $(PREPROCOPTIONS)