diff options
| author | Luca Deri <lucaderi@users.noreply.github.com> | 2020-09-20 18:33:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-20 18:33:57 +0200 |
| commit | ea9177cc9397270172e16e10e2ed947c8471323c (patch) | |
| tree | 492f6f90618cf5fb2ebee363ebf8aaee92999bfc | |
| parent | 1385f05713045b846f5a830cfc23eabd5f71e70d (diff) | |
| parent | fdef6f3545bd4a8e722b2ace144a2b73a782f265 (diff) | |
Merge pull request #1018 from lnslbrty/fix/make-dist
Fixed broken `make dist' and added CI check.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | example/Makefile.in | 4 | ||||
| -rw-r--r-- | src/include/Makefile.am | 12 | ||||
| -rw-r--r-- | src/lib/Makefile.in | 6 |
5 files changed, 12 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 4f5b66bbb..cbe38fc05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -179,6 +179,7 @@ script: - if [ -n "$QA_FUZZ" ]; then ./configure --enable-fuzztargets ; else ./configure ; fi - make - make -C example ndpiSimpleIntegration + - make dist #after_script: - cd tests diff --git a/Makefile.am b/Makefile.am index 6238c8b3c..335416e1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,4 +8,4 @@ endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libndpi.pc -EXTRA_DIST = autogen.sh +EXTRA_DIST = autogen.sh configure.seed diff --git a/example/Makefile.in b/example/Makefile.in index e0dc34b95..76848d4c1 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -54,6 +54,10 @@ clean: /bin/rm -f _install _postbuild _postinstall _preinstall /bin/rm -rf build +distdir: + cp categories.txt mining_hosts.txt README.DPDK '$(distdir)/' + find . -maxdepth 1 -type f -name '*.c' -o -name '*.h' -o -name '*.py' | xargs -I'{}' cp '{}' '$(distdir)/{}' + distclean: clean /bin/rm -f Makefile.dpdk /bin/rm -f Makefile diff --git a/src/include/Makefile.am b/src/include/Makefile.am deleted file mode 100644 index 19d6c60cf..000000000 --- a/src/include/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -p -plibrary_includedir=$(includedir)/libndpi-@VERSION@/libndpi - -library_include_HEADERS = ndpi_api.h \ - ndpi_define.h \ - ndpi_typedefs.h \ - ndpi_main.h \ - ndpi_protocol_ids.h \ - ndpi_protocols.h \ - ndpi_win32.h \ - ndpi_includes_OpenBSD.h \ - ndpi_includes.h diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 902941d26..6c69485b3 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -62,6 +62,12 @@ $(NDPI_LIB_SHARED): $(OBJECTS) clean: /bin/rm -f $(NDPI_LIB_STATIC) $(OBJECTS) *.o *.so *.lo libndpi.so* +distdir: + cp ndpi_content_match.c.inc '$(distdir)/' + find . -type d | xargs -I'{}' mkdir -p '$(distdir)/{}' + find ../include -type f -name '*.h' | xargs -I'{}' cp '{}' '$(distdir)/{}' + find . -type f -name '*.c' -o -name '*.h' | xargs -I'{}' cp '{}' '$(distdir)/{}' + distclean: clean /bin/rm -f Makefile |