diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-08-26 12:47:25 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-08-26 12:47:25 +0200 |
| commit | e0f1a60f5ff9d2efc8b106b5167f0170b8795dbe (patch) | |
| tree | fe5c4c0b3da0b30841eef8184dade6e39e2c7407 /Makefile.extr | |
| parent | 8d2e4a51d56b7f4d3673a5132edd1adb37a14295 (diff) | |
| parent | 7cfaf10b604372044f53cb65b03df33c23f8b26d (diff) | |
| download | compcert-e0f1a60f5ff9d2efc8b106b5167f0170b8795dbe.tar.gz compcert-e0f1a60f5ff9d2efc8b106b5167f0170b8795dbe.zip | |
Merge branch 'master' into debug_locations
Conflicts:
debug/CtoDwarf.ml
debug/DwarfPrinter.ml
debug/DwarfTypes.mli
Diffstat (limited to 'Makefile.extr')
| -rw-r--r-- | Makefile.extr | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.extr b/Makefile.extr index 4e17e904..1bb3eec8 100644 --- a/Makefile.extr +++ b/Makefile.extr @@ -162,10 +162,9 @@ clean: depend: $(GENERATED) @echo "Analyzing OCaml dependencies" - @$(OCAMLDEP) $(foreach d,$(DIRS),$(wildcard $(d)/*.mli $(d)/*.ml)) >.depend.extr - @$(OCAMLDEP) $(GENERATED) >> .depend.extr + @$(OCAMLDEP) $(foreach d,$(DIRS),$(wildcard $(d)/*.mli $(d)/*.ml)) $(GENERATED) >.depend.extr || { rm -f .depend.extr; exit 2; } ifneq ($(strip $(DIRS_P4)),) - @$(OCAMLDEP_P4) $(foreach d,$(DIRS_P4),$(wildcard $(d)/*.mli $(d)/*.ml)) >>.depend.extr + @$(OCAMLDEP_P4) $(foreach d,$(DIRS_P4),$(wildcard $(d)/*.mli $(d)/*.ml)) >>.depend.extr || { rm -f .depend.extr; exit 2; } endif |