From de71f3fdc94c855c4957a8b3fcd9daf74c19244e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 11 Apr 2020 04:10:17 +0300
Subject: [PATCH] reduce include directories

This removes -I src -I test -I tools from the autotools build and
-I ed25519/src from all build systems.
---
 CMakeLists.txt       | 1 -
 Jamfile              | 1 -
 examples/Makefile.am | 5 ++---
 src/Makefile.am      | 6 ++----
 test/Makefile.am     | 5 ++---
 tools/Makefile.am    | 3 ++-
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 350ab2a15..5154c0476 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -669,7 +669,6 @@ if (dht)
 		src/hasher512
 		src/sha512
 	)
-	target_include_directories(torrent-rasterbar PRIVATE ed25519/src)
 else()
 	target_compile_definitions(torrent-rasterbar PUBLIC TORRENT_DISABLE_DHT)
 endif()
diff --git a/Jamfile b/Jamfile
index 0f580a2af..14e10c527 100644
--- a/Jamfile
+++ b/Jamfile
@@ -757,7 +757,6 @@ lib torrent
 	src/$(SOURCES).cpp
 
 	: # requirements
-	<include>./ed25519/src
 	<threading>multi
 	<define>TORRENT_BUILDING_LIBRARY
 	<link>shared:<define>TORRENT_BUILDING_SHARED
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9d31acde0..e7bbf413d 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -30,7 +30,6 @@ upnp_test_SOURCES = upnp_test.cpp
 
 LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
 
-AM_CPPFLAGS = -ftemplate-depth-50 -I$(top_srcdir)/include @DEBUGFLAGS@ @OPENSSL_INCLUDES@
-
+AM_CPPFLAGS = -ftemplate-depth-50 @DEBUGFLAGS@
 AM_LDFLAGS = @BOOST_SYSTEM_LIB@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
-
+DEFAULT_INCLUDES = -I$(top_srcdir)/include @OPENSSL_INCLUDES@
diff --git a/src/Makefile.am b/src/Makefile.am
index c619d17ad..366de49c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -165,9 +165,9 @@ libtorrent_rasterbar_la_SOURCES = \
   \
   $(KADEMLIA_SOURCES)
 
-AM_CFLAGS = -I$(top_srcdir)/ed25519/src -std=c99
-AM_CPPFLAGS = -DTORRENT_BUILDING_LIBRARY -I$(top_srcdir)/include -I$(top_srcdir)/ed25519/src @DEBUGFLAGS@ @OPENSSL_INCLUDES@
+AM_CPPFLAGS = -DTORRENT_BUILDING_LIBRARY @DEBUGFLAGS@
 AM_LDFLAGS = @OPENSSL_LDFLAGS@
+DEFAULT_INCLUDES = -I$(top_srcdir)/include @OPENSSL_INCLUDES@
 
 libtorrent_rasterbar_la_LDFLAGS = -version-info $(INTERFACE_VERSION_INFO)
 libtorrent_rasterbar_la_LIBADD = @OPENSSL_LIBS@
@@ -181,5 +181,3 @@ if HAVE_WINDOWS
 libtorrent_rasterbar_la_LIBADD += -liphlpapi -lws2_32 -lwsock32
 libtorrent_rasterbar_la_CPPFLAGS += -DWIN32_LEAN_AND_MEAN -D__USE_W32_SOCKETS -DWIN32 -D_WIN32
 endif
-
-
diff --git a/test/Makefile.am b/test/Makefile.am
index 1e9cc5735..49ca0c834 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -279,7 +279,6 @@ test_alloca_SOURCES = test_alloca.cpp
 LDADD = libtest.la $(top_builddir)/src/libtorrent-rasterbar.la
 
 #AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@
-AM_CPPFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include @DEBUGFLAGS@ @OPENSSL_INCLUDES@
-
+AM_CPPFLAGS=-ftemplate-depth-50 @DEBUGFLAGS@
 AM_LDFLAGS=@BOOST_SYSTEM_LIB@ @PTHREAD_LIBS@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
-
+DEFAULT_INCLUDES = -I$(top_srcdir)/include @OPENSSL_INCLUDES@
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3c410fd34..bdcca2dbf 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -22,8 +22,9 @@ dht_put_SOURCES = dht_put.cpp
 
 LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
 
-AM_CPPFLAGS = -ftemplate-depth-50 -I$(top_srcdir)/include @DEBUGFLAGS@
+AM_CPPFLAGS = -ftemplate-depth-50 @DEBUGFLAGS@
 
 AM_LDFLAGS = @BOOST_SYSTEM_LIB@
 #AM_LDFLAGS = $(LDFLAGS) @BOOST_SYSTEM_LIB@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
 #AM_LDFLAGS = @OPENSSL_LDFLAGS@
+DEFAULT_INCLUDES = -I$(top_srcdir)/include