summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--otherlibs/labltk/support/.depend33
-rw-r--r--stdlib/Makefile5
-rw-r--r--tools/Makefile1
-rw-r--r--tools/Makefile.shared10
4 files changed, 31 insertions, 18 deletions
diff --git a/otherlibs/labltk/support/.depend b/otherlibs/labltk/support/.depend
index f8489f605..069735bef 100644
--- a/otherlibs/labltk/support/.depend
+++ b/otherlibs/labltk/support/.depend
@@ -1,26 +1,27 @@
-camltkwrap.cmi: protocol.cmi textvariable.cmi timer.cmi widget.cmi
+camltkwrap.cmi: widget.cmi timer.cmi textvariable.cmi protocol.cmi
protocol.cmi: widget.cmi
-textvariable.cmi: protocol.cmi widget.cmi
+textvariable.cmi: widget.cmi protocol.cmi
+tkthread.cmi: widget.cmi
widget.cmi: rawwidget.cmi
-camltkwrap.cmo: fileevent.cmi protocol.cmi rawwidget.cmi textvariable.cmi \
- timer.cmi camltkwrap.cmi
-camltkwrap.cmx: fileevent.cmx protocol.cmx rawwidget.cmx textvariable.cmx \
- timer.cmx camltkwrap.cmi
-fileevent.cmo: protocol.cmi support.cmi fileevent.cmi
-fileevent.cmx: protocol.cmx support.cmx fileevent.cmi
-protocol.cmo: support.cmi widget.cmi protocol.cmi
-protocol.cmx: support.cmx widget.cmx protocol.cmi
+camltkwrap.cmo: timer.cmi textvariable.cmi rawwidget.cmi protocol.cmi \
+ fileevent.cmi camltkwrap.cmi
+camltkwrap.cmx: timer.cmx textvariable.cmx rawwidget.cmx protocol.cmx \
+ fileevent.cmx camltkwrap.cmi
+fileevent.cmo: support.cmi protocol.cmi fileevent.cmi
+fileevent.cmx: support.cmx protocol.cmx fileevent.cmi
+protocol.cmo: widget.cmi support.cmi protocol.cmi
+protocol.cmx: widget.cmx support.cmx protocol.cmi
rawwidget.cmo: support.cmi rawwidget.cmi
rawwidget.cmx: support.cmx rawwidget.cmi
slave.cmo: widget.cmi
slave.cmx: widget.cmx
support.cmo: support.cmi
support.cmx: support.cmi
-textvariable.cmo: protocol.cmi support.cmi widget.cmi textvariable.cmi
-textvariable.cmx: protocol.cmx support.cmx widget.cmx textvariable.cmi
-timer.cmo: protocol.cmi support.cmi timer.cmi
-timer.cmx: protocol.cmx support.cmx timer.cmi
-tkthread.cmo: protocol.cmi timer.cmi widget.cmi tkthread.cmi
-tkthread.cmx: protocol.cmx timer.cmx widget.cmx tkthread.cmi
+textvariable.cmo: widget.cmi support.cmi protocol.cmi textvariable.cmi
+textvariable.cmx: widget.cmx support.cmx protocol.cmx textvariable.cmi
+timer.cmo: support.cmi protocol.cmi timer.cmi
+timer.cmx: support.cmx protocol.cmx timer.cmi
+tkthread.cmo: widget.cmi timer.cmi protocol.cmi tkthread.cmi
+tkthread.cmx: widget.cmx timer.cmx protocol.cmx tkthread.cmi
widget.cmo: rawwidget.cmi widget.cmi
widget.cmx: rawwidget.cmx widget.cmi
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 70fc05a01..2be2ae7c8 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -135,3 +135,8 @@ include .depend
depend:
$(CAMLDEP) *.mli *.ml > .depend
+
+$(OTHERS:.cmo=.cmi): pervasives.cmi
+
+.PHONY: all allopt allopt-noprof allopt-prof install installopt
+.PHONY: installopt-default installopt-noprof installopt-prof clean depend
diff --git a/tools/Makefile b/tools/Makefile
index 500000d23..bad14c7e5 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,4 +19,3 @@ include Makefile.shared
ocamlmktop: ocamlmktop.tpl ../config/Makefile
sed -e 's|%%BINDIR%%|$(BINDIR)|' ocamlmktop.tpl > ocamlmktop
chmod +x ocamlmktop
-
diff --git a/tools/Makefile.shared b/tools/Makefile.shared
index 8025d9c8a..aa8aba5f7 100644
--- a/tools/Makefile.shared
+++ b/tools/Makefile.shared
@@ -25,8 +25,10 @@ LINKFLAGS=$(INCLUDES)
all: ocamldep ocamlprof ocamlcp ocamlmktop ocamlmklib scrapelabels addlabels \
dumpobj
+.PHONY: all
opt.opt: ocamldep.opt
+.PHONY: opt.opt
# The dependency generator
@@ -83,9 +85,13 @@ clean::
# To help building mixed-mode libraries (Caml + C)
ocamlmklib: myocamlbuild_config.cmo ocamlmklib.cmo
- $(CAMLC) $(LINKFLAGS) -o ocamlmklib myocamlbuild_config.cmo ocamlmklib.cmo
+ $(CAMLC) $(LINKFLAGS) -o ocamlmklib myocamlbuild_config.cmo \
+ ocamlmklib.cmo
ocamlmklib.cmo: myocamlbuild_config.cmi
+
+myocamlbuild_config.cmi: myocamlbuild_config.cmo
+
myocamlbuild_config.ml: ../config/Makefile ../build/mkmyocamlbuild_config.sh
../build/mkmyocamlbuild_config.sh
cp ../myocamlbuild_config.ml .
@@ -265,4 +271,6 @@ clean::
depend: beforedepend
$(CAMLRUN) ./ocamldep $(INCLUDES) *.mli *.ml > .depend
+.PHONY: clean install beforedepend depend
+
include .depend