diff options
| author | Simone Mainardi <mainardi@ntop.org> | 2017-10-23 15:20:13 +0200 |
|---|---|---|
| committer | Simone Mainardi <mainardi@ntop.org> | 2017-10-23 15:20:30 +0200 |
| commit | 4f72b954da705f8d54a9dd61eae46b2b36b24dc0 (patch) | |
| tree | 8c9dad90336c388a13425a9cbf201dd8188c5aa4 | |
| parent | 5dbe705dd3acf115f3cadcc9379e4de6fbbd2c95 (diff) | |
Undoes 2155dd9 that breaks 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, 3 insertions, 4 deletions
diff --git a/example/Makefile.am b/example/Makefile.am index 6cc6a14ce..7fc29402a 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = ndpiReader -AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/lib/third_party/include @PCAP_INC@ +AM_CPPFLAGS = -I$(top_srcdir)/src/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 0587503f9..33043fde5 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 "libcache.h" +#include "../lib/third_party/include/libcache.h" #define BT_ANNOUNCE #define SNAP_EXT diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 39823d378..c2b4e4b13 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -12,8 +12,7 @@ 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 \ - third_party/include/libcache.h + ../include/ndpi_typedefs.h libndpi_la_SOURCES = ndpi_content_match.c.inc \ ndpi_main.c \ |