Use only .ocamlformat* to enable or disable ocamlformat

.ocamlformat

@@ -0,0 +1,4 @@
+# Please make a pull request to change this file.
+# Each directory that enables ocamlformat sets its own options, so here we just
+# disable it by default.
+disable=true

Makefile

@@ -77,66 +77,17 @@ promote:
 
 .PHONY: fmt
 fmt:
-	ocamlformat -i \
-	  $$(find middle_end/flambda2 \
-	    \( -name "*.ml" -or -name "*.mli" \) \
-	    -and \! \( -name "flambda_parser.*" -or -name "flambda_lex.*" \))
-	ocamlformat -i \
-	  $$(find backend/cfg \
-	    \( -name "*.ml" -or -name "*.mli" \))
-	ocamlformat -i middle_end/mangling.ml
-	ocamlformat -i middle_end/mangling.mli
-	ocamlformat -i \
-	  $$(find backend/asm_targets \
-	    \( -name "*.ml" -or -name "*.mli" \))
-	ocamlformat -i \
-	  $$(find backend/debug \
-	    \( -name "*.ml" -or -name "*.mli" \))
-	ocamlformat -i backend/cmm_helpers.ml{,i}
-	ocamlformat -i backend/cmm_builtins.ml{,i}
-	ocamlformat -i backend/checkmach.ml{,i}
-	ocamlformat -i tools/merge_archives.ml
-	ocamlformat -i \
-	  $$(find backend/debug/dwarf \
-	    \( -name "*.ml" -or -name "*.mli" \))
-	ocamlformat -i \
-	  $$(find utils \
-	    \( -name "*.ml" -or -name "*.mli" \))
-	ocamlformat -i \
-	  $$(find ocaml/utils \
-	    \( -name "*.ml" -or -name "*.mli" \))
+	ocamlformat -i $$(find . \( -name "*.ml" -or -name "*.mli" \))
 
 .PHONY: check-fmt
 check-fmt:
-	@if [ "$$(git status --porcelain middle_end/flambda2)" != "" ] || \
-           [ "$$(git status --porcelain backend/cfg)" != "" ] || \
-           [ "$$(git status --porcelain middle_end/mangling.ml)" != "" ] || \
-           [ "$$(git status --porcelain middle_end/mangling.mli)" != "" ] || \
-           [ "$$(git status --porcelain backend/asm_targets)" != "" ] || \
-           [ "$$(git status --porcelain backend/debug)" != "" ] || \
-           [ "$$(git status --porcelain backend/cmm_helpers.ml{,i})" != "" ] || \
-           [ "$$(git status --porcelain backend/cmm_builtins.ml{,i})" != "" ] || \
-           [ "$$(git status --porcelain backend/checkmach.ml{,i})" != "" ] || \
-           [ "$$(git status --porcelain tools/merge_archives.ml)" != "" ] || \
-           [ "$$(git status --porcelain ocaml/utils)" != "" ] || \
-           [ "$$(git status --porcelain utils)" != "" ]; then \
+	@if [ "$$(git status --porcelain)" != "" ]; then \
 	  echo; \
 	  echo "Tree must be clean before running 'make check-fmt'"; \
 	  exit 1; \
 	fi
 	$(MAKE) fmt
-	@if [ "$$(git diff middle_end/flambda2)" != "" ] || \
-           [ "$$(git diff backend/cfg)" != "" ] || \
-           [ "$$(git diff middle_end/mangling.ml)" != "" ] || \
-           [ "$$(git diff middle_end/mangling.mli)" != "" ] || \
-           [ "$$(git diff backend/asm_targets)" != "" ] || \
-           [ "$$(git diff backend/debug)" != "" ] || \
-           [ "$$(git diff backend/cmm_helpers.ml{,i})" != "" ] || \
-           [ "$$(git diff backend/cmm_builtins.ml{,i})" != "" ] || \
-           [ "$$(git diff backend/checkmach.ml{,i})" != "" ] || \
-           [ "$$(git diff tools/merge_archives.ml)" != "" ] || \
-           [ "$$(git diff ocaml/utils)" != "" ] || \
-           [ "$$(git diff utils)" != "" ]; then \
+	@if [ "$$(git diff)" != "" ]; then \
 	  echo; \
 	  echo "The following code was not formatted correctly:"; \
 	  echo "(the + side of the diff is how it should be formatted)"; \

backend/.ocamlformat-enable

@@ -2,8 +2,6 @@ cmm_helpers.ml
 cmm_helpers.mli
 cmm_builtins.ml
 cmm_builtins.mli
-internal_assembler/*.ml
-internal_assembler/*.mli
 checkmach.ml
 checkmach.mli
 cfg/**/*.ml

middle_end/.ocamlformat-enable

@@ -1,4 +1,2 @@
 mangling.ml
 mangling.mli
-flambda2/**/*.ml
-flambda2/**/*.mli

middle_end/flambda2/.ocamlformat

@@ -1,5 +1,6 @@
 # Please make a pull request to change this file.
 # Keep this file in sync with other .ocamlformat files in this repo.
+disable=false
 assignment-operator=begin-line
 cases-exp-indent=2
 doc-comments=before

middle_end/flambda2/parser/.ocamlformat-ignore

@@ -0,0 +1,2 @@
+flambda_lex.*
+flambda_parser.*

ocaml/manual/src/html_processing/.ocamlformat

@@ -0,0 +1 @@
+disable=true

tools/.ocamlformat-ignore

@@ -0,0 +1 @@
+flambda_backend_objinfo.ml