diff options
| author | Luca Deri <lucaderi@users.noreply.github.com> | 2018-01-24 18:08:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 18:08:44 +0100 |
| commit | f2280c90a44bcb44a07b6b6dff8e21e6eab3adfe (patch) | |
| tree | 699d281dba7ac188374ecf6ac3c21b863743596d | |
| parent | d18824a73fa7f05122bc35000a8a1b538c62fc58 (diff) | |
| parent | d896ce7469f5cebf08086c6ff2219c9909b02195 (diff) | |
Merge pull request #482 from hvanderheide/dev
Revert the revert of 2155dd9 after fixing ntopng Travis
| -rw-r--r-- | example/Makefile.am | 2 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 2 | ||||
| -rw-r--r-- | src/lib/Makefile.am | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/example/Makefile.am b/example/Makefile.am index 7fc29402a..6cc6a14ce 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = ndpiReader -AM_CPPFLAGS = -I$(top_srcdir)/src/include @PCAP_INC@ +AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/lib/third_party/include @PCAP_INC@ AM_CFLAGS = @PTHREAD_CFLAGS@ # --coverage LDADD = $(top_builddir)/src/lib/libndpi.la @JSON_C_LIB@ @PTHREAD_LIBS@ @PCAP_LIB@ @DL_LIB@ -lm diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 15b629068..052cdce0f 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -25,7 +25,7 @@ #define __NDPI_TYPEDEFS_H__ #include "ndpi_define.h" -#include "../lib/third_party/include/libcache.h" +#include "libcache.h" #define BT_ANNOUNCE #define SNAP_EXT diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 2d587496b..4b25e0162 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -12,7 +12,8 @@ libndpi_la_include_HEADERS = ../include/ndpi_api.h \ ../include/ndpi_includes.h \ ../include/ndpi_protocol_ids.h \ ../include/ndpi_protocols.h \ - ../include/ndpi_typedefs.h + ../include/ndpi_typedefs.h \ + third_party/include/libcache.h libndpi_la_SOURCES = ndpi_content_match.c.inc \ ndpi_main.c \ |