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>
This commit is contained in:
@@ -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/
|
||||
|
||||
+2
-2
@@ -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)
|
||||
|
||||
@@ -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 )
|
||||
@@ -23,6 +23,12 @@
|
||||
#ifndef __NDPI_DEFINE_INCLUDE_FILE__
|
||||
#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
|
||||
*/
|
||||
|
||||
@@ -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' \
|
||||
|
||||
Reference in New Issue
Block a user