Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit edcced8c authored by Andrei Paskevich's avatar Andrei Paskevich
Browse files

per-module depend files

parent 8e28f5bb
...@@ -9,6 +9,7 @@ why3.conf ...@@ -9,6 +9,7 @@ why3.conf
*.cmi *.cmi
*.cmxs *.cmxs
*.annot *.annot
*.dep
\#*\# \#*\#
# / # /
...@@ -17,7 +18,7 @@ why3.conf ...@@ -17,7 +18,7 @@ why3.conf
/autom4te.cache /autom4te.cache
/Makefile /Makefile
/configure /configure
/.depend.* /.depend.coq-libs
/semantic.cache /semantic.cache
/TAGS /TAGS
/output_why3 /output_why3
......
...@@ -47,6 +47,7 @@ STRIP = @STRIP@ ...@@ -47,6 +47,7 @@ STRIP = @STRIP@
CC = @CC@ CC = @CC@
OCAMLC = @OCAMLC@ OCAMLC = @OCAMLC@
OCAMLOPT = @OCAMLOPT@ OCAMLOPT = @OCAMLOPT@
OCAMLDEP = @OCAMLDEP@
OCAMLLEX = @OCAMLLEX@ OCAMLLEX = @OCAMLLEX@
OCAMLYACC = @OCAMLYACC@ OCAMLYACC = @OCAMLYACC@
OCAMLDOC = @OCAMLDOC@ OCAMLDOC = @OCAMLDOC@
...@@ -57,10 +58,9 @@ COQC = @COQC@ ...@@ -57,10 +58,9 @@ COQC = @COQC@
COQDEP = @COQDEP@ COQDEP = @COQDEP@
CAMLP5O = @CAMLP5O@ CAMLP5O = @CAMLP5O@
DEPFLAGS = -slash -I src
ifeq (@OCAMLBEST@,opt) ifeq (@OCAMLBEST@,opt)
OCAMLDEP = @OCAMLDEP@ -native DEPFLAGS += -native
else
OCAMLDEP = @OCAMLDEP@
endif endif
RUBBER = @RUBBER@ RUBBER = @RUBBER@
...@@ -154,11 +154,11 @@ ifeq (@enable_hypothesis_selection@,yes) ...@@ -154,11 +154,11 @@ ifeq (@enable_hypothesis_selection@,yes)
EXTLIBS += graph EXTLIBS += graph
endif endif
LIBML = $(addsuffix .ml, $(LIBMODULES)) LIBDEP = $(addsuffix .dep, $(LIBMODULES))
LIBMLI = $(addsuffix .mli, $(LIBMODULES))
LIBCMO = $(addsuffix .cmo, $(LIBMODULES)) LIBCMO = $(addsuffix .cmo, $(LIBMODULES))
LIBCMX = $(addsuffix .cmx, $(LIBMODULES)) LIBCMX = $(addsuffix .cmx, $(LIBMODULES))
$(LIBDEP): DEPFLAGS += $(LIBINCLUDES)
$(LIBCMO) $(LIBCMX): INCLUDES += $(LIBINCLUDES) $(LIBCMO) $(LIBCMX): INCLUDES += $(LIBINCLUDES)
$(LIBCMX): OFLAGS += -for-pack Why3 $(LIBCMX): OFLAGS += -for-pack Why3
...@@ -179,29 +179,26 @@ src/why3.cmo: $(LIBCMO) ...@@ -179,29 +179,26 @@ src/why3.cmo: $(LIBCMO)
src/why3.cmx: $(LIBCMX) src/why3.cmx: $(LIBCMX)
$(OCAMLOPT) $(OFLAGS) -pack -o $@ $^ $(OCAMLOPT) $(OFLAGS) -pack -o $@ $^
# depend target # clean and depend
include .depend.lib
.depend.lib: src/config.ml $(LIBGENERATED)
$(OCAMLDEP) -slash -I src $(LIBINCLUDES) $(LIBML) $(LIBMLI) > $@
depend: .depend.lib ifneq "$(MAKECMDGOALS)" "clean"
include $(LIBDEP)
endif
# clean target depend: $(LIBGENERATED) $(LIBDEP)
LIBSDIRS = src $(addprefix src/, $(LIBDIRS)) LIBSDIRS = src $(addprefix src/, $(LIBDIRS))
LIBCLEAN = $(addsuffix /*.cm[iox], $(LIBSDIRS)) \ LIBCLEAN = $(addsuffix /*.cm[iox], $(LIBSDIRS)) \
$(addsuffix /*.annot, $(LIBSDIRS)) \ $(addsuffix /*.annot, $(LIBSDIRS)) \
$(addsuffix /*.output, $(LIBSDIRS)) \ $(addsuffix /*.output, $(LIBSDIRS)) \
$(addsuffix /*.automaton, $(LIBSDIRS)) \ $(addsuffix /*.automaton, $(LIBSDIRS)) \
$(addsuffix /*.dep, $(LIBSDIRS)) \
$(addsuffix /*.o, $(LIBSDIRS)) \ $(addsuffix /*.o, $(LIBSDIRS)) \
$(addsuffix /*~, $(LIBSDIRS)) $(addsuffix /*~, $(LIBSDIRS))
clean:: clean::
rm -f $(LIBCLEAN) $(LIBGENERATED) rm -f $(LIBCLEAN) $(LIBGENERATED)
rm -f src/why3.cm[aiox] src/why3.[ao] src/why3.cmxa rm -f src/why3.cm[aiox] src/why3.[ao] src/why3.cmxa
rm -f .depend.lib
############### ###############
# installation # installation
...@@ -266,14 +263,14 @@ PLUGMODULES = $(addprefix plugins/parser/, $(PLUG_PARSER)) \ ...@@ -266,14 +263,14 @@ PLUGMODULES = $(addprefix plugins/parser/, $(PLUG_PARSER)) \
$(addprefix plugins/transform/, $(PLUG_TRANSFORM)) \ $(addprefix plugins/transform/, $(PLUG_TRANSFORM)) \
$(TPTPMODULES) $(TPTPMODULES)
PLUGML = $(addsuffix .ml, $(PLUGMODULES)) PLUGDEP = $(addsuffix .dep, $(PLUGMODULES))
PLUGMLI = $(addsuffix .mli, $(PLUGMODULES))
PLUGCMO = $(addsuffix .cmo, $(PLUGMODULES)) PLUGCMO = $(addsuffix .cmo, $(PLUGMODULES))
PLUGCMX = $(addsuffix .cmx, $(PLUGMODULES)) PLUGCMX = $(addsuffix .cmx, $(PLUGMODULES))
PLUGDIRS = parser printer transform tptp PLUGDIRS = parser printer transform tptp
PLUGINCLUDES = $(addprefix -I plugins/, $(PLUGDIRS)) PLUGINCLUDES = $(addprefix -I plugins/, $(PLUGDIRS))
$(PLUGDEP): DEPFLAGS += $(PLUGINCLUDES)
$(PLUGCMO) $(PLUGCMX): INCLUDES += $(PLUGINCLUDES) $(PLUGCMO) $(PLUGCMX): INCLUDES += $(PLUGINCLUDES)
plugins.byte: $(addsuffix .cmo, $(addprefix lib/plugins/, $(PLUGINS))) plugins.byte: $(addsuffix .cmo, $(addprefix lib/plugins/, $(PLUGINS)))
...@@ -311,26 +308,26 @@ lib/plugins/tptp.cmo: $(TPTPCMO) ...@@ -311,26 +308,26 @@ lib/plugins/tptp.cmo: $(TPTPCMO)
$(if $(QUIET),@echo 'Linking $@' &&) \ $(if $(QUIET),@echo 'Linking $@' &&) \
$(OCAMLC) $(BFLAGS) -pack -o $@ $^ $(OCAMLC) $(BFLAGS) -pack -o $@ $^
include .depend.plugins
.depend.plugins: $(PLUGGENERATED)
$(OCAMLDEP) -slash -I src -I plugins $(PLUGINCLUDES) \
$(PLUGML) $(PLUGMLI) > $@
depend: .depend.plugins
PLUGSDIRS = plugins $(addprefix plugins/, $(PLUGDIRS)) PLUGSDIRS = plugins $(addprefix plugins/, $(PLUGDIRS))
PLUGCLEAN = $(addsuffix /*.cm[iox], $(PLUGSDIRS)) \ PLUGCLEAN = $(addsuffix /*.cm[iox], $(PLUGSDIRS)) \
$(addsuffix /*.annot, $(PLUGSDIRS)) \ $(addsuffix /*.annot, $(PLUGSDIRS)) \
$(addsuffix /*.output, $(PLUGSDIRS)) \ $(addsuffix /*.output, $(PLUGSDIRS)) \
$(addsuffix /*.automaton, $(PLUGSDIRS)) \ $(addsuffix /*.automaton, $(PLUGSDIRS)) \
$(addsuffix /*.dep, $(PLUGSDIRS)) \
$(addsuffix /*.o, $(PLUGSDIRS)) \ $(addsuffix /*.o, $(PLUGSDIRS)) \
$(addsuffix /*~, $(PLUGSDIRS)) $(addsuffix /*~, $(PLUGSDIRS))
# depend and clean targets
ifneq "$(MAKECMDGOALS)" "clean"
include $(PLUGDEP)
endif
depend: $(PLUGGENERATED) $(PLUGDEP)
clean:: clean::
rm -f $(PLUGCLEAN) $(PLUGGENERATED) rm -f $(PLUGCLEAN) $(PLUGGENERATED)
rm -f lib/plugins/* rm -f lib/plugins/*
rm -f .depend.plugins
install_no_local:: install_no_local::
mkdir -p $(LIBDIR)/why3/plugins mkdir -p $(LIBDIR)/why3/plugins
...@@ -377,11 +374,11 @@ PGM_FILES = pgm_ttree pgm_types pgm_pretty \ ...@@ -377,11 +374,11 @@ PGM_FILES = pgm_ttree pgm_types pgm_pretty \
PGMMODULES = $(addprefix src/programs/, $(PGM_FILES)) PGMMODULES = $(addprefix src/programs/, $(PGM_FILES))
PGMML = $(addsuffix .ml, $(PGMMODULES)) PGMDEP = $(addsuffix .dep, $(PGMMODULES))
PGMMLI = $(addsuffix .mli, $(PGMMODULES))
PGMCMO = $(addsuffix .cmo, $(PGMMODULES)) PGMCMO = $(addsuffix .cmo, $(PGMMODULES))
PGMCMX = $(addsuffix .cmx, $(PGMMODULES)) PGMCMX = $(addsuffix .cmx, $(PGMMODULES))
$(PGMDEP): DEPFLAGS += -I src/programs
$(PGMCMO) $(PGMCMX): INCLUDES += -I src/programs $(PGMCMO) $(PGMCMX): INCLUDES += -I src/programs
# build targets # build targets
...@@ -403,18 +400,16 @@ bin/why3ml: bin/why3ml.@OCAMLBEST@ ...@@ -403,18 +400,16 @@ bin/why3ml: bin/why3ml.@OCAMLBEST@
# depend and clean targets # depend and clean targets
include .depend.programs ifneq "$(MAKECMDGOALS)" "clean"
include $(PGMDEP)
.depend.programs: endif
$(OCAMLDEP) -slash -I src -I src/programs $(PGMML) $(PGMMLI) > $@
depend: .depend.programs depend: $(PGMDEP)
clean:: clean::
rm -f src/programs/*.cm[iox] src/programs/*.o rm -f src/programs/*.cm[iox] src/programs/*.o
rm -f src/programs/*.annot src/programs/*~ rm -f src/programs/*.annot src/programs/*.dep src/programs/*~
rm -f bin/why3ml.byte bin/why3ml.opt bin/why3ml rm -f bin/why3ml.byte bin/why3ml.opt bin/why3ml
rm -f .depend.programs
# test target # test target
...@@ -446,11 +441,11 @@ MLW_FILES = mlw_ty mlw_expr mlw_decl mlw_module ...@@ -446,11 +441,11 @@ MLW_FILES = mlw_ty mlw_expr mlw_decl mlw_module
MLWMODULES = $(addprefix src/whyml/, $(MLW_FILES)) MLWMODULES = $(addprefix src/whyml/, $(MLW_FILES))
MLWML = $(addsuffix .ml, $(MLWMODULES)) MLWDEP = $(addsuffix .dep, $(MLWMODULES))
MLWMLI = $(addsuffix .mli, $(MLWMODULES))
MLWCMO = $(addsuffix .cmo, $(MLWMODULES)) MLWCMO = $(addsuffix .cmo, $(MLWMODULES))
MLWCMX = $(addsuffix .cmx, $(MLWMODULES)) MLWCMX = $(addsuffix .cmx, $(MLWMODULES))
$(MLWDEP): DEPFLAGS += -I src/whyml
$(MLWCMO) $(MLWCMX): INCLUDES += -I src/whyml $(MLWCMO) $(MLWCMX): INCLUDES += -I src/whyml
# build targets # build targets
...@@ -460,18 +455,16 @@ opt: $(MLWCMX) ...@@ -460,18 +455,16 @@ opt: $(MLWCMX)
# depend and clean targets # depend and clean targets
include .depend.whyml ifneq "$(MAKECMDGOALS)" "clean"
include $(MLWDEP)
.depend.whyml: endif
$(OCAMLDEP) -slash -I src -I src/whyml $(MLWML) $(MLWMLI) > $@
depend: .depend.whyml depend: $(MLWDEP)
clean:: clean::
rm -f src/whyml/*.cm[iox] src/whyml/*.o rm -f src/whyml/*.cm[iox] src/whyml/*.o
rm -f src/whyml/*.annot src/whyml/*~ rm -f src/whyml/*.annot src/whyml/*.dep src/whyml/*~
# rm -f bin/why3ml.byte bin/why3ml.opt bin/why3ml # rm -f bin/why3ml.byte bin/why3ml.opt bin/why3ml
rm -f .depend.whyml
########## ##########
# gallery # gallery
...@@ -503,11 +496,11 @@ CONFIG_FILES = whyconfig ...@@ -503,11 +496,11 @@ CONFIG_FILES = whyconfig
CONFIGMODULES = $(addprefix src/config/, $(CONFIG_FILES)) CONFIGMODULES = $(addprefix src/config/, $(CONFIG_FILES))
CONFIGML = $(addsuffix .ml, $(CONFIGMODULES)) CONFIGDEP = $(addsuffix .dep, $(CONFIGMODULES))
CONFIGMLI = $(addsuffix .mli, $(CONFIGMODULES))
CONFIGCMO = $(addsuffix .cmo, $(CONFIGMODULES)) CONFIGCMO = $(addsuffix .cmo, $(CONFIGMODULES))
CONFIGCMX = $(addsuffix .cmx, $(CONFIGMODULES)) CONFIGCMX = $(addsuffix .cmx, $(CONFIGMODULES))
$(CONFIGDEP): DEPFLAGS += -I src/programs
$(CONFIGCMO) $(CONFIGCMX): INCLUDES += -I src/programs $(CONFIGCMO) $(CONFIGCMX): INCLUDES += -I src/programs
# build targets # build targets
...@@ -529,19 +522,17 @@ bin/why3config: bin/why3config.@OCAMLBEST@ ...@@ -529,19 +522,17 @@ bin/why3config: bin/why3config.@OCAMLBEST@
# depend and clean targets # depend and clean targets
include .depend.config ifneq "$(MAKECMDGOALS)" "clean"
include $(CONFIGDEP)
.depend.config: $(CONFIGGENERATED) endif
$(OCAMLDEP) -slash -I src -I src/config $(CONFIGML) $(CONFIGMLI) > $@
depend: .depend.config depend: $(CONFIGDEP)
clean:: clean::
rm -f src/config/*.cm[iox] src/config/*.o rm -f src/config/*.cm[iox] src/config/*.o
rm -f src/config/*.annot src/config/*~ rm -f src/config/*.annot src/config/*.dep src/config/*~
rm -f src/config/*.output src/config/*.automaton rm -f src/config/*.output src/config/*.automaton
rm -f bin/why3config.byte bin/why3config.opt bin/why3config rm -f bin/why3config.byte bin/why3config.opt bin/why3config
rm -f .depend.config
local_config: bin/why3config.@OCAMLBEST@ local_config: bin/why3config.@OCAMLBEST@
WHY3LIB=$(PWD) WHY3DATA=$(PWD)/share bin/why3config.@OCAMLBEST@ \ WHY3LIB=$(PWD) WHY3DATA=$(PWD)/share bin/why3config.@OCAMLBEST@ \
...@@ -562,11 +553,11 @@ IDE_FILES = gconfig gmain ...@@ -562,11 +553,11 @@ IDE_FILES = gconfig gmain
IDEMODULES = $(addprefix src/ide/, $(IDE_FILES)) IDEMODULES = $(addprefix src/ide/, $(IDE_FILES))
IDEML = $(addsuffix .ml, $(IDEMODULES)) IDEDEP = $(addsuffix .dep, $(IDEMODULES))
IDEMLI = $(addsuffix .mli, $(IDEMODULES))
IDECMO = $(addsuffix .cmo, $(IDEMODULES)) IDECMO = $(addsuffix .cmo, $(IDEMODULES))
IDECMX = $(addsuffix .cmx, $(IDEMODULES)) IDECMX = $(addsuffix .cmx, $(IDEMODULES))
$(IDEDEP): DEPFLAGS += -I src/ide
$(IDECMO) $(IDECMX): INCLUDES += -I src/ide $(IDECMO) $(IDECMX): INCLUDES += -I src/ide
# build targets # build targets
...@@ -592,19 +583,17 @@ bin/why3ide: bin/why3ide.@OCAMLBEST@ ...@@ -592,19 +583,17 @@ bin/why3ide: bin/why3ide.@OCAMLBEST@
# depend and clean targets # depend and clean targets
include .depend.ide ifneq "$(MAKECMDGOALS)" "clean"
include $(IDEDEP)
.depend.ide: endif
$(OCAMLDEP) -slash -I src -I src/ide $(IDEML) $(IDEMLI) > $@
depend: .depend.ide depend: $(IDEDEP)
clean:: clean::
rm -f src/ide/xml.ml rm -f src/ide/xml.ml
rm -f src/ide/*.cm[iox] src/ide/*.o rm -f src/ide/*.cm[iox] src/ide/*.o
rm -f src/ide/*.annot src/ide/*~ rm -f src/ide/*.annot src/ide/*.dep src/ide/*~
rm -f bin/why3ide.byte bin/why3ide.opt bin/why3ide rm -f bin/why3ide.byte bin/why3ide.opt bin/why3ide
rm -f .depend.ide
install_no_local:: install_no_local::
cp -f bin/why3ide.@OCAMLBEST@ $(BINDIR)/why3ide$(EXE) cp -f bin/why3ide.@OCAMLBEST@ $(BINDIR)/why3ide$(EXE)
...@@ -622,11 +611,11 @@ REPLAYER_FILES = replay ...@@ -622,11 +611,11 @@ REPLAYER_FILES = replay
REPLAYERMODULES = $(addprefix src/ide/, $(REPLAYER_FILES)) REPLAYERMODULES = $(addprefix src/ide/, $(REPLAYER_FILES))
REPLAYERML = $(addsuffix .ml, $(REPLAYERMODULES)) REPLAYERDEP = $(addsuffix .dep, $(REPLAYERMODULES))
REPLAYERMLI = $(addsuffix .mli, $(REPLAYERMODULES))
REPLAYERCMO = $(addsuffix .cmo, $(REPLAYERMODULES)) REPLAYERCMO = $(addsuffix .cmo, $(REPLAYERMODULES))
REPLAYERCMX = $(addsuffix .cmx, $(REPLAYERMODULES)) REPLAYERCMX = $(addsuffix .cmx, $(REPLAYERMODULES))
$(REPLAYERDEP): DEPFLAGS += -I src/ide
$(REPLAYERCMO) $(REPLAYERCMX): INCLUDES += -I src/ide $(REPLAYERCMO) $(REPLAYERCMX): INCLUDES += -I src/ide
# build targets # build targets
...@@ -648,18 +637,14 @@ bin/why3replayer: bin/why3replayer.@OCAMLBEST@ ...@@ -648,18 +637,14 @@ bin/why3replayer: bin/why3replayer.@OCAMLBEST@
# depend and clean targets # depend and clean targets
include .depend.replayer ifneq "$(MAKECMDGOALS)" "clean"
include $(REPLAYERDEP)
.depend.replayer: endif
$(OCAMLDEP) -slash -I src -I src/ide $(REPLAYERML) $(REPLAYERMLI) > $@
depend: .depend.replayer depend: $(REPLAYERDEP)
clean:: clean::
rm -f src/ide/*.cm[iox] src/ide/*.o
rm -f src/ide/*.annot src/ide/*~
rm -f bin/why3replayer.byte bin/why3replayer.opt bin/why3replayer rm -f bin/why3replayer.byte bin/why3replayer.opt bin/why3replayer
rm -f .depend.replayer
install_no_local:: install_no_local::
cp -f bin/why3replayer.@OCAMLBEST@ $(BINDIR)/why3replayer$(EXE) cp -f bin/why3replayer.@OCAMLBEST@ $(BINDIR)/why3replayer$(EXE)
...@@ -676,11 +661,11 @@ SESSION_FILES = why3session_lib why3session_mod why3session_copy \ ...@@ -676,11 +661,11 @@ SESSION_FILES = why3session_lib why3session_mod why3session_copy \
SESSIONMODULES = $(addprefix src/why3session/, $(SESSION_FILES)) SESSIONMODULES = $(addprefix src/why3session/, $(SESSION_FILES))
SESSIONML = $(addsuffix .ml, $(SESSIONMODULES)) SESSIONDEP = $(addsuffix .dep, $(SESSIONMODULES))
SESSIONMLI = $(addsuffix .mli, $(SESSIONMODULES))
SESSIONCMO = $(addsuffix .cmo, $(SESSIONMODULES)) SESSIONCMO = $(addsuffix .cmo, $(SESSIONMODULES))
SESSIONCMX = $(addsuffix .cmx, $(SESSIONMODULES)) SESSIONCMX = $(addsuffix .cmx, $(SESSIONMODULES))
$(SESSIONDEP): DEPFLAGS += -I src/why3session
$(SESSIONCMO) $(SESSIONCMX): INCLUDES += -I src/why3session $(SESSIONCMO) $(SESSIONCMX): INCLUDES += -I src/why3session
# build targets # build targets
...@@ -702,18 +687,16 @@ bin/why3session: bin/why3session.@OCAMLBEST@ ...@@ -702,18 +687,16 @@ bin/why3session: bin/why3session.@OCAMLBEST@
# depend and clean targets # depend and clean targets
include .depend.session ifneq "$(MAKECMDGOALS)" "clean"
include $(SESSIONDEP)
.depend.session: endif
$(OCAMLDEP) -slash -I src -I src/why3session $(SESSIONML) $(SESSIONMLI) > $@
depend: .depend.session depend: $(SESSIONDEP)
clean:: clean::
rm -f src/ide/*.cm[iox] src/ide/*.o rm -f src/why3session/*.cm[iox] src/why3session/*.o
rm -f src/ide/*.annot src/ide/*~ rm -f src/why3session/*.annot src/why3session/*.dep src/why3session/*~
rm -f bin/why3session.byte bin/why3session.opt bin/why3session rm -f bin/why3session.byte bin/why3session.opt bin/why3session
rm -f .depend.session
install_no_local:: install_no_local::
cp -f bin/why3session.@OCAMLBEST@ $(BINDIR)/why3session$(EXE) cp -f bin/why3session.@OCAMLBEST@ $(BINDIR)/why3session$(EXE)
...@@ -728,11 +711,11 @@ STATS_FILES = stats ...@@ -728,11 +711,11 @@ STATS_FILES = stats
STATSMODULES = $(addprefix src/ide/, $(STATS_FILES)) STATSMODULES = $(addprefix src/ide/, $(STATS_FILES))
STATSML = $(addsuffix .ml, $(STATSMODULES)) STATSDEP = $(addsuffix .dep, $(STATSMODULES))
STATSMLI = $(addsuffix .mli, $(STATSMODULES))
STATSCMO = $(addsuffix .cmo, $(STATSMODULES)) STATSCMO = $(addsuffix .cmo, $(STATSMODULES))
STATSCMX = $(addsuffix .cmx, $(STATSMODULES)) STATSCMX = $(addsuffix .cmx, $(STATSMODULES))
$(STATSDEP): DEPFLAGS += -I src/ide
$(STATSCMO) $(STATSCMX): INCLUDES += -I src/ide $(STATSCMO) $(STATSCMX): INCLUDES += -I src/ide
# build targets # build targets
...@@ -754,16 +737,14 @@ bin/why3stats: bin/why3stats.@OCAMLBEST@ ...@@ -754,16 +737,14 @@ bin/why3stats: bin/why3stats.@OCAMLBEST@
# depend and clean targets # depend and clean targets
include .depend.stats ifneq "$(MAKECMDGOALS)" "clean"
include $(STATSDEP)
.depend.stats: endif
$(OCAMLDEP) -slash -I src -I src/ide $(STATSML) $(STATSMLI) > $@
depend: .depend.stats depend: $(STATSDEP)
clean:: clean::
rm -f bin/why3stats.byte bin/why3stats.opt bin/why3stats rm -f bin/why3stats.byte bin/why3stats.opt bin/why3stats
rm -f .depend.stats
install_no_local:: install_no_local::
cp -f bin/why3stats.@OCAMLBEST@ $(BINDIR)/why3stats cp -f bin/why3stats.@OCAMLBEST@ $(BINDIR)/why3stats
...@@ -778,11 +759,11 @@ HTML_FILES = html_session ...@@ -778,11 +759,11 @@ HTML_FILES = html_session
HTMLMODULES = $(addprefix src/ide/, $(HTML_FILES)) HTMLMODULES = $(addprefix src/ide/, $(HTML_FILES))
HTMLML = $(addsuffix .ml, $(HTMLMODULES)) HTMLDEP = $(addsuffix .dep, $(HTMLMODULES))
HTMLMLI = $(addsuffix .mli, $(HTMLMODULES))
HTMLCMO = $(addsuffix .cmo, $(HTMLMODULES)) HTMLCMO = $(addsuffix .cmo, $(HTMLMODULES))
HTMLCMX = $(addsuffix .cmx, $(HTMLMODULES)) HTMLCMX = $(addsuffix .cmx, $(HTMLMODULES))
$(HTMLDEP): DEPFLAGS += -I src/ide
$(HTMLCMO) $(HTMLCMX): INCLUDES += -I src/ide $(HTMLCMO) $(HTMLCMX): INCLUDES += -I src/ide
# build targets # build targets
...@@ -804,16 +785,14 @@ bin/why3html: bin/why3html.@OCAMLBEST@ ...@@ -804,16 +785,14 @@ bin/why3html: bin/why3html.@OCAMLBEST@
# depend and clean targets # depend and clean targets
include .depend.html ifneq "$(MAKECMDGOALS)" "clean"
include $(HTMLDEP)
.depend.html: endif
$(OCAMLDEP) -slash -I src -I src/ide $(HTMLML) $(HTMLMLI) > $@
depend: .depend.html depend: $(HTMLDEP)
clean:: clean::
rm -f bin/why3html.byte bin/why3html.opt bin/why3html rm -f bin/why3html.byte bin/why3html.opt bin/why3html
rm -f .depend.html
install_no_local:: install_no_local::
cp -f bin/why3html.@OCAMLBEST@ $(BINDIR)/why3html cp -f bin/why3html.@OCAMLBEST@ $(BINDIR)/why3html
...@@ -831,11 +810,11 @@ BENCH_FILES = worker db bench benchrc benchdb whybench ...@@ -831,11 +810,11 @@ BENCH_FILES = worker db bench benchrc benchdb whybench
BENCHMODULES := $(addprefix src/bench/, $(BENCH_FILES)) BENCHMODULES := $(addprefix src/bench/, $(BENCH_FILES))
BENCHML = $(addsuffix .ml, $(BENCHMODULES)) BENCHDEP = $(addsuffix .dep, $(BENCHMODULES))
BENCHMLI = $(addsuffix .mli, $(BENCHMODULES))
BENCHCMO = $(addsuffix .cmo, $(BENCHMODULES)) BENCHCMO = $(addsuffix .cmo, $(BENCHMODULES))
BENCHCMX = $(addsuffix .cmx, $(BENCHMODULES)) BENCHCMX = $(addsuffix .cmx, $(BENCHMODULES))
$(BENCHDEP): DEPFLAGS += -I src/bench
$(BENCHCMO) $(BENCHCMX): INCLUDES += -I src/bench -I @SQLITE3LIB@ $(BENCHCMO) $(BENCHCMX): INCLUDES += -I src/bench -I @SQLITE3LIB@
# build targets # build targets
...@@ -860,18 +839,16 @@ bin/why3bench: bin/why3bench.@OCAMLBEST@ ...@@ -860,18 +839,16 @@ bin/why3bench: bin/why3bench.@OCAMLBEST@
# depend and clean targets # depend and clean targets
include .depend.bench ifneq "$(MAKECMDGOALS)" "clean"
include $(BENCHDEP)
.depend.bench: endif
$(OCAMLDEP) -slash -I src -I src/bench -I src/ide $(BENCHML) $(BENCHMLI) > $@
depend: .depend.bench depend: $(BENCHDEP)
clean:: clean::
rm -f src/bench/*.cm[iox] src/bench/*.o rm -f src/bench/*