wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

reduce include directories 

This removes -I src -I test -I tools from the autotools build and
-I ed25519/src from all build systems.
This commit is contained in:
Orivej Desh 2020-04-11 04:10:17 +03:00 committed by Arvid Norberg
parent 46a6b74ee0
commit de71f3fdc9
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -669,7 +669,6 @@ if (dht)
src/hasher512 src/hasher512
src/sha512 src/sha512
) )
target_include_directories(torrent-rasterbar PRIVATE ed25519/src)
else() else()
target_compile_definitions(torrent-rasterbar PUBLIC TORRENT_DISABLE_DHT) target_compile_definitions(torrent-rasterbar PUBLIC TORRENT_DISABLE_DHT)
endif() endif()

1
Jamfile
View File

@ -757,7 +757,6 @@ lib torrent
src/$(SOURCES).cpp src/$(SOURCES).cpp
: # requirements : # requirements
<include>./ed25519/src
<threading>multi <threading>multi
<define>TORRENT_BUILDING_LIBRARY <define>TORRENT_BUILDING_LIBRARY
<link>shared:<define>TORRENT_BUILDING_SHARED <link>shared:<define>TORRENT_BUILDING_SHARED

5
examples/Makefile.am
View File

@ -30,7 +30,6 @@ upnp_test_SOURCES = upnp_test.cpp
LDADD = $(top_builddir)/src/libtorrent-rasterbar.la 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@ AM_LDFLAGS = @BOOST_SYSTEM_LIB@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
DEFAULT_INCLUDES = -I$(top_srcdir)/include @OPENSSL_INCLUDES@

6
src/Makefile.am
View File

@ -165,9 +165,9 @@ libtorrent_rasterbar_la_SOURCES = \
\ \
$(KADEMLIA_SOURCES) $(KADEMLIA_SOURCES)
AM_CFLAGS = -I$(top_srcdir)/ed25519/src -std=c99 AM_CPPFLAGS = -DTORRENT_BUILDING_LIBRARY @DEBUGFLAGS@
AM_CPPFLAGS = -DTORRENT_BUILDING_LIBRARY -I$(top_srcdir)/include -I$(top_srcdir)/ed25519/src @DEBUGFLAGS@ @OPENSSL_INCLUDES@
AM_LDFLAGS = @OPENSSL_LDFLAGS@ AM_LDFLAGS = @OPENSSL_LDFLAGS@
DEFAULT_INCLUDES = -I$(top_srcdir)/include @OPENSSL_INCLUDES@
libtorrent_rasterbar_la_LDFLAGS = -version-info $(INTERFACE_VERSION_INFO) libtorrent_rasterbar_la_LDFLAGS = -version-info $(INTERFACE_VERSION_INFO)
libtorrent_rasterbar_la_LIBADD = @OPENSSL_LIBS@ libtorrent_rasterbar_la_LIBADD = @OPENSSL_LIBS@
@ -181,5 +181,3 @@ if HAVE_WINDOWS
libtorrent_rasterbar_la_LIBADD += -liphlpapi -lws2_32 -lwsock32 libtorrent_rasterbar_la_LIBADD += -liphlpapi -lws2_32 -lwsock32
libtorrent_rasterbar_la_CPPFLAGS += -DWIN32_LEAN_AND_MEAN -D__USE_W32_SOCKETS -DWIN32 -D_WIN32 libtorrent_rasterbar_la_CPPFLAGS += -DWIN32_LEAN_AND_MEAN -D__USE_W32_SOCKETS -DWIN32 -D_WIN32
endif endif

5
test/Makefile.am
View File

@ -279,7 +279,6 @@ test_alloca_SOURCES = test_alloca.cpp
LDADD = libtest.la $(top_builddir)/src/libtorrent-rasterbar.la 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_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@ AM_LDFLAGS=@BOOST_SYSTEM_LIB@ @PTHREAD_LIBS@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
DEFAULT_INCLUDES = -I$(top_srcdir)/include @OPENSSL_INCLUDES@

3
tools/Makefile.am
View File

@ -22,8 +22,9 @@ dht_put_SOURCES = dht_put.cpp
LDADD = $(top_builddir)/src/libtorrent-rasterbar.la 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 = @BOOST_SYSTEM_LIB@
#AM_LDFLAGS = $(LDFLAGS) @BOOST_SYSTEM_LIB@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@ #AM_LDFLAGS = $(LDFLAGS) @BOOST_SYSTEM_LIB@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
#AM_LDFLAGS = @OPENSSL_LDFLAGS@ #AM_LDFLAGS = @OPENSSL_LDFLAGS@
DEFAULT_INCLUDES = -I$(top_srcdir)/include