From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 27 Mar 2022 18:58:44 +0000 (+0200)
Subject: Don't put the --recursive option in .astylerc.
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=3b117ab744100ca48f257ec6c9df83757cad8224;p=tinc

Don't put the --recursive option in .astylerc.

When calling astyle manually without wildcards in the filename(s),
astyle will refuse to work if the --recursive option is used. Remove it
from .astylerc and add the option to the command line when the "reformat"
build target is used.
---

diff --git a/.astylerc b/.astylerc
index 4b89b18a..8d504221 100644
--- a/.astylerc
+++ b/.astylerc
@@ -2,7 +2,6 @@
 --convert-tabs
 --exclude=subprojects
 --exclude=build
---recursive
 -i
 -j
 -f
@@ -13,4 +12,3 @@
 -k3
 -w
 --formatted
-
diff --git a/meson.build b/meson.build
index f96fb323..38062a9c 100644
--- a/meson.build
+++ b/meson.build
@@ -121,7 +121,7 @@ prog_reformat = find_program('astyle', native: true, required: false)
 if prog_reformat.found()
   run_target('reformat', command: [
     prog_reformat,
-    '--options=@SOURCE_ROOT@/.astylerc',
+    '--options=@SOURCE_ROOT@/.astylerc', '--recursive',
     '@SOURCE_ROOT@/*.c', '@SOURCE_ROOT@/*.h',
   ])
 endif