Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build system: use ocamlc -depend rather than ocamldep

master
Sébastien Hinderer 2019-01-03 15:17:51 +01:00
parent 3dac696197
commit d258bb78ac
14 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debugger/Makefile
View File

@ -28,7 +28,7 @@ COMPFLAGS=$(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
LINKFLAGS=-linkall -I $(UNIXDIR)
YACCFLAGS=
CAMLLEX=$(CAMLRUN) $(ROOTDIR)/boot/ocamllex
CAMLDEP=$(CAMLRUN) $(ROOTDIR)/tools/ocamldep
CAMLDEP=$(CAMLRUN) $(ROOTDIR)/boot/ocamlc -depend
DEPFLAGS=-slash
DEPINCLUDES=$(INCLUDES)

2
lex/Makefile
View File

@ -31,7 +31,7 @@ COMPFLAGS = $(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
LINKFLAGS =
YACCFLAGS = -v
CAMLLEX = $(CAMLRUN) $(ROOTDIR)/boot/ocamllex
CAMLDEP = $(CAMLRUN) $(ROOTDIR)/tools/ocamldep
CAMLDEP = $(CAMLRUN) $(ROOTDIR)/boot/ocamlc -depend
DEPFLAGS = -slash
DEPINCLUDES =

2
ocamldoc/Makefile
View File

@ -24,7 +24,7 @@ OCAMLYACC ?= $(ROOTDIR)/yacc/ocamlyacc
STDLIBFLAGS = -nostdlib -I $(ROOTDIR)/stdlib
OCAMLC = $(OCAMLRUN) $(ROOTDIR)/ocamlc $(STDLIBFLAGS)
OCAMLOPT = $(OCAMLRUN) $(ROOTDIR)/ocamlopt $(STDLIBFLAGS)
OCAMLDEP = $(OCAMLRUN) $(ROOTDIR)/tools/ocamldep
OCAMLDEP = $(OCAMLRUN) $(ROOTDIR)/boot/ocamlc -depend
DEPFLAGS = -slash
OCAMLLEX = $(OCAMLRUN) $(ROOTDIR)/boot/ocamllex
# TODO: figure out whether the DEBUG lines the following preprocessor removes

2
ocamltest/Makefile
View File

@ -159,7 +159,7 @@ ocamlc := $(ROOTDIR)/runtime/ocamlrun $(ROOTDIR)/ocamlc $(flags)
ocamlopt := $(ROOTDIR)/runtime/ocamlrun $(ROOTDIR)/ocamlopt $(flags)
ocamldep := $(ROOTDIR)/runtime/ocamlrun $(ROOTDIR)/tools/ocamldep
ocamldep := $(ROOTDIR)/runtime/ocamlrun $(ROOTDIR)/boot/ocamlc -depend
depflags := -slash
depincludes :=

2
otherlibs/bigarray/Makefile
View File

@ -33,6 +33,6 @@ mmap_ba.$(O): ../unix/mmap_ba.c
.PHONY: depend
depend:
$(CAMLRUN) $(ROOTDIR)/tools/ocamldep -slash *.mli *.ml > .depend
$(CAMLRUN) $(ROOTDIR)/boot/ocamlc -depend -slash *.mli *.ml > .depend
include .depend

2
otherlibs/graph/Makefile
View File

@ -29,6 +29,6 @@ include ../Makefile.otherlibs.common
depend:
$(CC) -MM $(OC_CPPFLAGS) *.c | sed -e 's, /[^ ]*\.h,,g' > .depend
$(CAMLRUN) ../../tools/ocamldep -slash *.mli *.ml >> .depend
$(CAMLRUN) ../../boot/ocamlc -depend -slash *.mli *.ml >> .depend
include .depend

2
otherlibs/raw_spacetime_lib/Makefile
View File

@ -27,7 +27,7 @@ ifeq "$(TOOLCHAIN)" "msvc"
$(error Dependencies cannot be regenerated using the MSVC ports)
else
$(CC) -MM $(OC_CPPFLAGS) *.c | sed -e 's/\.o/.$$(O)/g' > .depend
$(CAMLRUN) $(ROOTDIR)/tools/ocamldep -slash *.mli *.ml >> .depend
$(CAMLRUN) $(ROOTDIR)/boot/ocamlc -depend -slash *.mli *.ml >> .depend
endif
include .depend

2
otherlibs/str/Makefile
View File

@ -30,7 +30,7 @@ ifeq "$(TOOLCHAIN)" "msvc"
$(error Dependencies cannot be regenerated using the MSVC ports)
else
$(CC) -MM $(OC_CPPFLAGS) *.c | sed -e 's/\.o/.$$(O)/g' > .depend
$(CAMLRUN) $(ROOTDIR)/tools/ocamldep -slash *.mli *.ml >> .depend
$(CAMLRUN) $(ROOTDIR)/boot/ocamlc -depend -slash *.mli *.ml >> .depend
endif
include .depend

2
otherlibs/systhreads/Makefile
View File

@ -161,7 +161,7 @@ depend:
-DNATIVE_CODE -DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM) \
st_stubs.c | sed -e 's/st_stubs\.o/st_stubs_n.$$(O)/' \
-e 's/ st_\(posix\|win32\)\.h//g' >> .depend
$(CAMLRUN) ../../tools/ocamldep -slash *.mli *.ml >> .depend
$(CAMLRUN) ../../boot/ocamlc -depend -slash *.mli *.ml >> .depend
endif
include .depend

2
otherlibs/threads/Makefile
View File

@ -153,7 +153,7 @@ ifeq "$(TOOLCHAIN)" "msvc"
$(error Dependencies cannot be regenerated using the MSVC ports)
else
$(CC) -MM $(OC_CPPFLAGS) *.c > .depend
$(CAMLRUN) ../../tools/ocamldep -slash *.mli *.ml >> .depend
$(CAMLRUN) ../../boot/ocamlc -depend -slash *.mli *.ml >> .depend
endif
include .depend

2
otherlibs/unix/Makefile
View File

@ -52,7 +52,7 @@ ifeq "$(TOOLCHAIN)" "msvc"
$(error Dependencies cannot be regenerated using the MSVC ports)
else
$(CC) -MM $(OC_CPPFLAGS) *.c > .depend
$(CAMLRUN) ../../tools/ocamldep -slash *.mli *.ml >> .depend
$(CAMLRUN) ../../boot/ocamlc -depend -slash *.mli *.ml >> .depend
endif
include .depend

2
otherlibs/win32unix/Makefile
View File

@ -72,7 +72,7 @@ else
depend: $(ALL_FILES) $(UNIX_CAML_FILES) unix.ml
$(CC) -MM $(OC_CPPFLAGS) -I../unix $(ALL_FILES) \
| sed -e 's/\.o/.$$(O)/g' > .depend
$(CAMLRUN) $(ROOTDIR)/tools/ocamldep -slash $(UNIX_CAML_FILES) \
$(CAMLRUN) $(ROOTDIR)/boot/ocamlc -depend -slash $(UNIX_CAML_FILES) \
unix.ml >> .depend
endif

5
stdlib/Makefile
View File

@ -33,7 +33,7 @@ OPTCOMPFLAGS=
endif
OPTCOMPILER=$(ROOTDIR)/ocamlopt
CAMLOPT=$(CAMLRUN) $(OPTCOMPILER)
CAMLDEP=$(CAMLRUN) $(ROOTDIR)/tools/ocamldep
CAMLDEP=$(CAMLRUN) $(ROOTDIR)/boot/ocamlc -depend
DEPFLAGS=-slash
OC_CPPFLAGS += -I$(ROOTDIR)/runtime
@ -281,7 +281,8 @@ $(OBJS:.cmo=.cmi) std_exit.cmi: $(COMPILER_DEPS)
$(OBJS:.cmo=.cmx) std_exit.cmx: $(OPTCOMPILER)
$(OBJS:.cmo=.p.cmx) std_exit.p.cmx: $(OPTCOMPILER)
# Dependencies on Stdlib (not tracked by ocamldep)
# Dependencies on Stdlib (not tracked by ocamlc -depend)
$(OTHERS) std_exit.cmo: stdlib.cmi
$(OTHERS:.cmo=.cmi) std_exit.cmi: stdlib.cmi
$(OBJS:.cmo=.cmx) std_exit.cmx: stdlib.cmi

2
tools/Makefile
View File

@ -425,7 +425,7 @@ clean::
clean::
rm -f *.cmo *.cmi *.cma *.dll *.so *.lib *.a
CAMLDEP=$(CAMLRUN) ./ocamldep
CAMLDEP=$(CAMLRUN) ../boot/ocamlc -depend
DEPFLAGS=-slash
DEPINCLUDES=$(INCLUDES)
depend: beforedepend