]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: makefile: fix the "make clean" target on strict bourne shells
authorWilly Tarreau <w@1wt.eu>
Wed, 21 Apr 2021 15:17:16 +0000 (17:17 +0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 21 Apr 2021 15:22:33 +0000 (17:22 +0200)
As reported by @axinojolais in issue #1217, some older bourne shells do
not expand on braces so some files were not cleaned since the recent
splitting of the contrib/ subdir. Let's fix that by explicitly listing
the patterns to be cleared (which are in much smaller quantity now that
contrib was removed), and for grouping them with their respective dirs.

At some point, some recursive makefiles would probably help there.

Makefile

index d38d6c60a670596a3afbaa9652db0fa60d1f41f4..c39fac6a9434121790bdda5740fc9c260a383607 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1008,13 +1008,14 @@ clean:
        $(Q)for dir in . src dev/* admin/* addons/* include/* doc; do rm -f $$dir/*~ $$dir/*.rej $$dir/core; done
        $(Q)rm -f haproxy-$(VERSION).tar.gz haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION).tar.gz
        $(Q)rm -f haproxy-$(VERSION) haproxy-$(VERSION)$(SUBVERS)$(EXTRAVERSION) nohup.out gmon.out
-       $(Q)rm -f {admin,dev}/*/*.[oas] {admin,dev}/*/*/*.[oas] {admin,dev}/*/*/*/*.[oas]
        $(Q)rm -f addons/promex/*.[oas]
        $(Q)rm -f addons/51degrees/*.[oas] addons/51degrees/dummy/*.[oas] addons/51degrees/dummy/*/*.[oas]
        $(Q)rm -f addons/deviceatlas/*.[oas] addons/deviceatlas/dummy/*.[oas]
        $(Q)rm -f addons/ot/src/*.[oas]
        $(Q)rm -f addons/wurfl/*.[oas] addons/wurfl/dummy/*.[oas]
+       $(Q)rm -f admin/*/*.[oas] admin/*/*/*.[oas]
        $(Q)rm -f admin/iprange/iprange admin/iprange/ip6range admin/halog/halog
+       $(Q)rm -f dev/*/*.[oas]
        $(Q)rm -f dev/flags/flags dev/poll/poll dev/tcploop/tcploop
        $(Q)rm -f dev/hpack/decode dev/hpack/gen-enc dev/hpack/gen-rht