From 5e4c5003c5cd5709e599aedbfdd5ef223dd3dc79 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 13 Jun 2019 15:56:10 +0200 Subject: [PATCH] CLEANUP: 51d: move the 51d dummy lib to contrib/51d/src to match the real lib This way the directory structure remains the same as with the real lib and one can apply the same build options regardless of where the lib is stored, removing any possible confusion. --- contrib/51d/{ => src}/cityhash/city.c | 0 contrib/51d/{ => src}/pattern/51Degrees.c | 0 contrib/51d/{ => src}/pattern/51Degrees.h | 0 contrib/51d/{ => src}/threading.c | 0 contrib/51d/{ => src}/trie/51Degrees.c | 0 contrib/51d/{ => src}/trie/51Degrees.h | 0 doc/51Degrees-device-detection.txt | 6 ++++-- 7 files changed, 4 insertions(+), 2 deletions(-) rename contrib/51d/{ => src}/cityhash/city.c (100%) rename contrib/51d/{ => src}/pattern/51Degrees.c (100%) rename contrib/51d/{ => src}/pattern/51Degrees.h (100%) rename contrib/51d/{ => src}/threading.c (100%) rename contrib/51d/{ => src}/trie/51Degrees.c (100%) rename contrib/51d/{ => src}/trie/51Degrees.h (100%) diff --git a/contrib/51d/cityhash/city.c b/contrib/51d/src/cityhash/city.c similarity index 100% rename from contrib/51d/cityhash/city.c rename to contrib/51d/src/cityhash/city.c diff --git a/contrib/51d/pattern/51Degrees.c b/contrib/51d/src/pattern/51Degrees.c similarity index 100% rename from contrib/51d/pattern/51Degrees.c rename to contrib/51d/src/pattern/51Degrees.c diff --git a/contrib/51d/pattern/51Degrees.h b/contrib/51d/src/pattern/51Degrees.h similarity index 100% rename from contrib/51d/pattern/51Degrees.h rename to contrib/51d/src/pattern/51Degrees.h diff --git a/contrib/51d/threading.c b/contrib/51d/src/threading.c similarity index 100% rename from contrib/51d/threading.c rename to contrib/51d/src/threading.c diff --git a/contrib/51d/trie/51Degrees.c b/contrib/51d/src/trie/51Degrees.c similarity index 100% rename from contrib/51d/trie/51Degrees.c rename to contrib/51d/src/trie/51Degrees.c diff --git a/contrib/51d/trie/51Degrees.h b/contrib/51d/src/trie/51Degrees.h similarity index 100% rename from contrib/51d/trie/51Degrees.h rename to contrib/51d/src/trie/51Degrees.h diff --git a/doc/51Degrees-device-detection.txt b/doc/51Degrees-device-detection.txt index 2d4679d355..f0349abaa8 100644 --- a/doc/51Degrees-device-detection.txt +++ b/doc/51Degrees-device-detection.txt @@ -58,9 +58,11 @@ For HAProxy developers who need to verify that their changes didn't affect the directory. This does not function, but implements the API such that the 51Degrees module can be used (but not return any meaningful information). To test either Pattern or Hash Trie, build with: - $ make TARGET= USE_51DEGREES=1 51DEGREES_SRC=contrib/51d/pattern + + $ make TARGET= USE_51DEGREES=1 51DEGREES_SRC=contrib/51d/src/pattern or - $ make TARGET= USE_51DEGREES=1 51DEGREES_SRC=contrib/51d/trie + $ make TARGET= USE_51DEGREES=1 51DEGREES_SRC=contrib/51d/src/trie + respectively. The configuration file needs to set the following parameters: -- 2.47.3