diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-09-18 14:50:35 +0200 |
|---|---|---|
| committer | Toni <matzeton@googlemail.com> | 2022-09-21 18:03:22 +0200 |
| commit | d27fb1e73e729fdce33aad2ee1474c6b7614753b (patch) | |
| tree | d6aa6e8509acc888d88428fac9e03dd73e8c5e9a | |
| parent | 817a7c616dae9431c89bb20aeed87c37b7e0d5a7 (diff) | |
Moved `NDPI_API_VERSION` to `src/include/ndpi_define.h.in` where it belongs.
That way, we can make `src/include/ndpi_api.h` independent of autoconf.
MSBuild will like that.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/include/ndpi_api.h (renamed from src/include/ndpi_api.h.in) | 5 | ||||
| -rw-r--r-- | src/include/ndpi_define.h.in | 6 | ||||
| -rw-r--r-- | src/lib/Makefile.in | 1 |
5 files changed, 8 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 74a832df7..204b8675a 100644 --- a/.gitignore +++ b/.gitignore @@ -69,7 +69,6 @@ /rrdtool/rrd_anomaly /rrdtool/rrd_similarity /src/include/Makefile -/src/include/ndpi_api.h /src/include/ndpi_config.h /src/include/ndpi_define.h /src/lib/.deps/ diff --git a/configure.ac b/configure.ac index 8c19a217a..fbf1bb8c2 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,7 @@ if test -d ".git" || test -r ".git"; then A=`git log src/include/ndpi_typedefs.h|wc -l` B=`git log src/include/ndpi_protocol_ids.h|wc -l` - C=`git log src/include/ndpi_api.h.in|wc -l` + C=`git log src/include/ndpi_api.h|wc -l` NDPI_API_VERSION=$((A+B+C)) else GIT_RELEASE="${PACKAGE_VERSION}" @@ -363,7 +363,7 @@ dnl> ADDITIONAL_LIBS="${ADDITIONAL_LIBS} -lcurl" dnl> AC_DEFINE_UNQUOTED(HAVE_CURL, 1, [curl is present]) dnl> fi -AC_CONFIG_FILES([Makefile example/Makefile example/Makefile.dpdk tests/Makefile tests/unit/Makefile tests/performance/Makefile tests/dga/Makefile rrdtool/Makefile influxdb/Makefile libndpi.pc src/include/ndpi_define.h src/lib/Makefile fuzz/Makefile src/include/ndpi_api.h doc/Doxyfile.cfg]) +AC_CONFIG_FILES([Makefile example/Makefile example/Makefile.dpdk tests/Makefile tests/unit/Makefile tests/performance/Makefile tests/dga/Makefile rrdtool/Makefile influxdb/Makefile libndpi.pc src/include/ndpi_define.h src/lib/Makefile fuzz/Makefile doc/Doxyfile.cfg]) AC_CONFIG_FILES([tests/do.sh], [chmod +x tests/do.sh]) AC_CONFIG_HEADERS(src/include/ndpi_config.h) AC_SUBST(GIT_RELEASE) diff --git a/src/include/ndpi_api.h.in b/src/include/ndpi_api.h index cf6c1e469..02fd54b79 100644 --- a/src/include/ndpi_api.h.in +++ b/src/include/ndpi_api.h @@ -31,11 +31,6 @@ extern "C" { #endif - /* The #define below is used for apps that dynamically link with nDPI to make - sure that datastructures and in sync across versions - */ -#define NDPI_API_VERSION @NDPI_API_VERSION@ - #define SIZEOF_FLOW_STRUCT ( sizeof(struct ndpi_flow_struct) ) #define NDPI_DETECTION_ONLY_IPV4 ( 1 << 0 ) diff --git a/src/include/ndpi_define.h.in b/src/include/ndpi_define.h.in index b25430945..3b21e5dfb 100644 --- a/src/include/ndpi_define.h.in +++ b/src/include/ndpi_define.h.in @@ -24,6 +24,12 @@ #define __NDPI_DEFINE_INCLUDE_FILE__ /* + * The #define below is used for apps that dynamically link with nDPI to make + * sure that datastructures and in sync across versions + */ +#define NDPI_API_VERSION @NDPI_API_VERSION@ + +/* gcc -E -dM - < /dev/null |grep ENDIAN */ diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 312679756..a79cbba29 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -74,7 +74,6 @@ clean: distdir: find . -type d | xargs -I'{}' mkdir -p '$(distdir)/{}' find ../include -type f -name '*.h' \ - -a '!' -name 'ndpi_api.h' \ -a '!' -name 'ndpi_config.h' \ -a '!' -name 'ndpi_define.h' | xargs -I'{}' cp '{}' '$(distdir)/{}' find . -type f -name '*.c' \ |