From 656323c33450db868cda7b3e2cc75d0e417d8d6e Mon Sep 17 00:00:00 2001
From: Toni <matzeton@googlemail.com>
Date: Tue, 29 Sep 2020 17:58:33 +0200
Subject: Added missing files to `make dist' target which are not required to
 build nDPI but still somehow essential. (#1024)

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
 Makefile.am         | 2 +-
 autogen.sh          | 2 +-
 example/Makefile.in | 2 +-
 python/Makefile.in  | 6 +++---
 tests/Makefile.am   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 335416e1b..d59ad6819 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,4 +8,4 @@ endif
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libndpi.pc
 
-EXTRA_DIST = autogen.sh configure.seed
+EXTRA_DIST = README.md CHANGELOG.md CONTRIBUTING.md README.protocols autogen.sh configure.seed wireshark python windows utils packages doc/nDPI_QuickStartGuide.pages doc/nDPI_QuickStartGuide.pdf example/MacOS example/Win32
diff --git a/autogen.sh b/autogen.sh
index 283f63f74..bda811918 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -58,4 +58,4 @@ cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define
 cat configure.tmp > configure
 
 chmod +x configure
-./configure "$*"
+./configure ${*}
diff --git a/example/Makefile.in b/example/Makefile.in
index 76848d4c1..5a9836a83 100644
--- a/example/Makefile.in
+++ b/example/Makefile.in
@@ -55,7 +55,7 @@ clean:
 	/bin/rm -rf build
 
 distdir:
-	cp categories.txt mining_hosts.txt README.DPDK '$(distdir)/'
+	cp categories.txt mining_hosts.txt protos.txt README.DPDK '$(distdir)/'
 	find . -maxdepth 1 -type f -name '*.c' -o -name '*.h' -o -name '*.py' | xargs -I'{}' cp '{}' '$(distdir)/{}'
 
 distclean: clean
diff --git a/python/Makefile.in b/python/Makefile.in
index 91b4230c7..497e689fe 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -1,8 +1,8 @@
 CC=@CC@
-CFLAGS=-I. -I../src/include -I./src/lib/third_party/include -shared -Wl,
+CFLAGS=-I. -I../src/include -I./src/lib/third_party/include @CFLAGS@ @CUSTOM_NDPI@ -shared
 #LIBNDPI=../src/lib/libndpi.so.@NDPI_VERSION_SHORT@
 LIBNDPI=../src/lib/libndpi.a
-LDFLAGS=$(CFILE) $(LIBNDPI) -lpcap
+LDFLAGS=$(CFILE) $(LIBNDPI) -lpcap @ADDITIONAL_LIBS@
 SHARE = -soname,ndpi_wrap
 SO=ndpi_wrap.so
 OBJS = ndpi_wrap.o
@@ -19,7 +19,7 @@ endif
 all: $(SO)
 
 $(SO): $(CFILE) $(LIBNDPI) Makefile
-	$(CC) $(CFLAGS)$(SHARE) -o $@ $(PIC) $(LDFLAGS)
+	$(CC) $(CFLAGS) -Wl,$(SHARE) -o $@ $(PIC) $(LDFLAGS)
 #	ln -s $(LIBNDPI) .
 
 clean:
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6671ecb3a..75fc7e030 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 TESTS = do.sh
 
-EXTRA_DIST = do.sh pcap result
+EXTRA_DIST = do.sh vagrind_test.sh ossfuzz.sh pcap result
 
 all:
 	@echo ""
-- 
cgit v1.2.3