BUILD: makefile: refactor support for 51DEGREES v3/v4
In order to simplify maintenance and long-term evolutions, now the
feature remains enabled by setting USE_51DEGREES=1 and the version
is set in 51DEGREES_VER (3 or 4 are supported only). The default
version remains 3. All 51DEGREES flags are shared between both
versions and only use the "51DEGREES_" prefix.
The related CFLAGS and LDFLAGS can now be overridden using
51DEGREES_CFLAGS and 51DEGREES_LDFLAGS, both of which are automatically
collected into the respective OPTIONS_*. The USE_51DEGREES_V4 option is
now removed, and the doc was updated.
diff --git a/doc/51Degrees-device-detection.txt b/doc/51Degrees-device-detection.txt
index b3d3421..2fa64e3 100644
--- a/doc/51Degrees-device-detection.txt
+++ b/doc/51Degrees-device-detection.txt
@@ -30,11 +30,11 @@
git clone --recurse-submodules https://github.com/51Degrees/device-detection-cxx.git
-then run 'make' with USE_51DEGREES or USE_51DEGREES_V4 (if using 51Degrees
-version 4), and 51DEGREES_SRC set. Both 51DEGREES_INC and 51DEGREES_LIB may
-additionally be used to force specific different paths for .o and .h, but
-will default to 51DEGREES_SRC. Make sure to replace '51D_REPO_PATH' with
-the path to the 51Degrees repository.
+then run 'make' with USE_51DEGREES, optionally 51DEGREES_VER=4 (if using
+51Degrees version 4), and 51DEGREES_SRC set. Both 51DEGREES_INC and
+51DEGREES_LIB may additionally be used to force specific different paths for
+.o and .h, but will default to 51DEGREES_SRC. Make sure to replace
+'51D_REPO_PATH' with the path to the 51Degrees repository.
51Degrees provide 4 different detection algorithms:
@@ -55,7 +55,7 @@
To build with the 51Degrees Device Detection V4 use the following command line.
- $ make TARGET=<target> USE_51DEGREES_V4=1 51DEGREES_SRC='51D_REPO_PATH'/src
+ $ make TARGET=<target> USE_51DEGREES=1 51DEGREES_VER=4 51DEGREES_SRC='51D_REPO_PATH'/src
A data file containing information about devices, browsers, operating systems
and their associated signatures is then needed. 51Degrees provide a free
@@ -77,7 +77,7 @@
or
$ make TARGET=<target> USE_51DEGREES=1 51DEGREES_SRC=addons/51degrees/dummy/trie
or
- $ make TARGET=<target> USE_51DEGREES_V4=1 51DEGREES_SRC=addons/51degrees/dummy/v4hash
+ $ make TARGET=<target> USE_51DEGREES=1 51DEGREES_VER=4 51DEGREES_SRC=addons/51degrees/dummy/v4hash
respectively.