From 580727f3af5efad2940f76ac7e1cab2cea5e28eb Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Wed, 21 Apr 2021 15:13:10 +0200
Subject: [PATCH] CLEANUP: contrib: remove the last references to the now dead
 contrib/ directory

Now with the last SPOA modules gone, contrib/ doesn't exist anymore
and does not need to be referenced in the Makefile nor .gitignore.
---
 .gitignore   | 1 -
 CONTRIBUTING | 4 +---
 Makefile     | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94e5b8e96..ae8b6a24c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@
 !/SUBVERS
 !/VERDATE
 !/VERSION
-!/contrib
 !/admin
 !/dev
 !/doc
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 73a27c7db..db89ef7bc 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -818,9 +818,7 @@ exhaustive:
 
   - poll      any of the pollers
 
-  - halog     the halog sub-component in the contrib directory
-
-  - contrib   any addition to the contrib directory
+  - halog     the halog sub-component in the admin directory
 
   - htx       general HTX subsystem
 
diff --git a/Makefile b/Makefile
index 2d9cc0ca5..d38d6c60a 100644
--- a/Makefile
+++ b/Makefile
@@ -1008,7 +1008,7 @@ 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,contrib}/*/*.[oas] {admin,dev,contrib}/*/*/*.[oas] {admin,dev,contrib}/*/*/*/*.[oas]
+	$(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]