diff options
| author | Michele Campus <fci1908@gmail.com> | 2016-08-13 16:22:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-13 16:22:40 +0200 |
| commit | 48341094a37f40a2cd9d67a948eef8efc5167339 (patch) | |
| tree | 426c23def75e3360f10d18bd8c3485d26ec9f615 | |
| parent | dc88cc4e64fd7458772a9c3c6fbf7fbbb3667e31 (diff) | |
| parent | fb73ab95ea23db486f5f4d380af0ff68e6f01f34 (diff) | |
Merge pull request #248 from theirix/build-check2
Added instructions how to run tests
| -rw-r--r-- | README.md | 9 | ||||
| -rw-r--r-- | example/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
4 files changed, 15 insertions, 1 deletions
@@ -15,6 +15,10 @@ In order to compile this library do - ./configure - make +To run tests do additionally: + +- make check + Please note that the pre-requisites for compilation include: - GNU tools (autogen, automake, autoconf, libtool) - GNU C compiler (gcc) @@ -34,6 +38,7 @@ The entire procedure of adding new protocols in detail: 9. ./autogen.sh 10. ./configure 11. make +12. make check ### Creating A Source File Tar Ball @@ -41,6 +46,10 @@ If you want to distribute a source tar file of nDPI do: - make dist +To ensure that a tar file includes all necessary files and to run tests on distribution do: + +- make distcheck + [ntopng_logo]: https://camo.githubusercontent.com/0f789abcef232035c05e0d2e82afa3cc3be46485/687474703a2f2f7777772e6e746f702e6f72672f77702d636f6e74656e742f75706c6f6164732f323031312f30382f6e746f706e672d69636f6e2d313530783135302e706e67 [ntop_logo]: https://camo.githubusercontent.com/58e2a1ecfff62d8ecc9d74633bd1013f26e06cba/687474703a2f2f7777772e6e746f702e6f72672f77702d636f6e74656e742f75706c6f6164732f323031352f30352f6e746f702e706e67 diff --git a/example/Makefile.am b/example/Makefile.am index 875f9901e..a55212c92 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = @PTHREAD_CFLAGS@ LDADD = $(top_builddir)/src/lib/libndpi.la @JSON_C_LIB@ @PTHREAD_LIBS@ @PCAP_LIB@ AM_LDFLAGS = -static -ndpiReader_SOURCES = ndpiReader.c ndpi_util.c +ndpiReader_SOURCES = ndpiReader.c ndpi_util.c ndpi_util.h ndpiReader.o: ndpiReader.c diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 3ba119d7d..b920d4d67 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -160,8 +160,11 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \ protocols/zeromq.c \ third_party/include/actypes.h \ third_party/include/ahocorasick.h \ + third_party/include/ndpi_patricia.h \ third_party/include/node.h \ third_party/include/sort.h \ third_party/src/ahocorasick.c \ third_party/src/node.c \ third_party/src/sort.c + +EXTRA_DIST = third_party/src/ndpi_patricia.c diff --git a/tests/Makefile.am b/tests/Makefile.am index f0836970b..a8a127088 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1 +1,3 @@ TESTS = do.sh + +EXTRA_DIST = do.sh pcap result |