nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 15:23:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
b733044f7a
tor/src/tools/include.am

74 lines
2.5 KiB
Plaintext
Raw Normal View History

When enabling NSS, disable OpenSSL. We used to link both libraries at once, but now that I'm working on TLS, there's nothing left to keep OpenSSL around for when NSS is enabled. Note that this patch causes a couple of places that still assumed OpenSSL to be disabled when NSS is enabled - tor-gencert - pbkdf2
2018-08-12 23:18:41 +02:00
bin_PROGRAMS+= src/tools/tor-resolve src/tools/tor-print-ed-signing-cert
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 15:31:43 +02:00
build tor-cov-{resolve,gencert} This allows us to run tor-cov-gencert from chutney for coverage builds.
2015-03-22 04:21:08 +01:00
if COVERAGE_ENABLED
When enabling NSS, disable OpenSSL. We used to link both libraries at once, but now that I'm working on TLS, there's nothing left to keep OpenSSL around for when NSS is enabled. Note that this patch causes a couple of places that still assumed OpenSSL to be disabled when NSS is enabled - tor-gencert - pbkdf2
2018-08-12 23:18:41 +02:00
noinst_PROGRAMS+= src/tools/tor-cov-resolve
build tor-cov-{resolve,gencert} This allows us to run tor-cov-gencert from chutney for coverage builds.
2015-03-22 04:21:08 +01:00
endif
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 15:31:43 +02:00
src_tools_tor_resolve_SOURCES = src/tools/tor-resolve.c
tor-resolve: link tor-resolve binary with trunnel lib
2018-09-11 18:39:00 +02:00
src_tools_tor_resolve_LDFLAGS = @TOR_LDFLAGS_openssl@
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
src_tools_tor_resolve_LDADD = \
tor-resolve: link tor-resolve binary with trunnel lib
2018-09-11 18:39:00 +02:00
src/trunnel/libor-trunnel.a \
Tabify all of the .am files.
2018-07-01 15:37:28 +02:00
$(TOR_UTIL_LIBS) \
tor-resolve: link tor-resolve binary with trunnel lib
2018-09-11 18:39:00 +02:00
$(TOR_CRYPTO_LIBS) $(TOR_LIBS_CRYPTLIB)\
22839: Build tor with rust enabled on win - make tor_util static library name configurable - fix Rust libary dependency order for Windows
2017-08-10 10:08:41 +02:00
$(rust_ldadd) \
Link GetAdaptersAddresses, rather than loading it on-demand. This function has been present since Windows XP.
2018-06-27 15:09:10 +02:00
@TOR_LIB_MATH@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_USERENV@
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 15:31:43 +02:00
build tor-cov-{resolve,gencert} This allows us to run tor-cov-gencert from chutney for coverage builds.
2015-03-22 04:21:08 +01:00
if COVERAGE_ENABLED
src_tools_tor_cov_resolve_SOURCES = src/tools/tor-resolve.c
src_tools_tor_cov_resolve_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
src_tools_tor_cov_resolve_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
Fix coverage build
2018-09-13 08:57:43 +02:00
src_tools_tor_cov_resolve_LDFLAGS = @TOR_LDFLAGS_openssl@
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
src_tools_tor_cov_resolve_LDADD = \
Fix coverage build
2018-09-13 08:57:43 +02:00
src/trunnel/libor-trunnel.a \
Tabify all of the .am files.
2018-07-01 15:37:28 +02:00
$(TOR_UTIL_TESTING_LIBS) \
Fix coverage build
2018-09-13 08:57:43 +02:00
$(TOR_CRYPTO_TESTING_LIBS) $(TOR_LIBS_CRYPTLIB) \
Fix inconsistent tab/space mixing in include.am files. This is a whitespace only, cosmetic fix. There is still some inconsistency between lists, but less inconsistency inside individual lists.
2016-05-12 19:06:58 +02:00
@TOR_LIB_MATH@ @TOR_LIB_WS32@
build tor-cov-{resolve,gencert} This allows us to run tor-cov-gencert from chutney for coverage builds.
2015-03-22 04:21:08 +01:00
endif
When enabling NSS, disable OpenSSL. We used to link both libraries at once, but now that I'm working on TLS, there's nothing left to keep OpenSSL around for when NSS is enabled. Note that this patch causes a couple of places that still assumed OpenSSL to be disabled when NSS is enabled - tor-gencert - pbkdf2
2018-08-12 23:18:41 +02:00
if USE_NSS
# ...
else
bin_PROGRAMS += src/tools/tor-gencert
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 15:31:43 +02:00
src_tools_tor_gencert_SOURCES = src/tools/tor-gencert.c
Make our crypto library symbolic in the makefiles.
2018-07-11 18:51:36 +02:00
src_tools_tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB)
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
src_tools_tor_gencert_LDADD = \
Tabify all of the .am files.
2018-07-01 15:37:28 +02:00
$(TOR_CRYPTO_LIBS) \
$(TOR_UTIL_LIBS) \
22839: Build tor with rust enabled on win - make tor_util static library name configurable - fix Rust libary dependency order for Windows
2017-08-10 10:08:41 +02:00
$(rust_ldadd) \
Make our crypto library symbolic in the makefiles.
2018-07-11 18:51:36 +02:00
@TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \
Link GetAdaptersAddresses, rather than loading it on-demand. This function has been present since Windows XP.
2018-06-27 15:09:10 +02:00
@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@
When enabling NSS, disable OpenSSL. We used to link both libraries at once, but now that I'm working on TLS, there's nothing left to keep OpenSSL around for when NSS is enabled. Note that this patch causes a couple of places that still assumed OpenSSL to be disabled when NSS is enabled - tor-gencert - pbkdf2
2018-08-12 23:18:41 +02:00
endif
build tor-cov-{resolve,gencert} This allows us to run tor-cov-gencert from chutney for coverage builds.
2015-03-22 04:21:08 +01:00
Tool to print expiration date of ed25519_signing_cert
2018-06-13 12:20:47 +02:00
src_tools_tor_print_ed_signing_cert_SOURCES = src/tools/tor-print-ed-signing-cert.c
src_tools_tor_print_ed_signing_cert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
src_tools_tor_print_ed_signing_cert_LDADD = \
src/trunnel/libor-trunnel.a \
$(TOR_CRYPTO_LIBS) \
$(TOR_UTIL_LIBS) \
Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged
2018-08-01 01:56:23 +02:00
@TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \
Add missing library to build tor-print-ed-signing-cert. To succesful compile tor-print-ed-signing-cert.exe on Windows we sometimes need to include the @TOR_LIB_GDI@ library. See: https://bugs.torproject.org/28485
2018-11-17 03:29:04 +01:00
@TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_GDI@
Tool to print expiration date of ed25519_signing_cert
2018-06-13 12:20:47 +02:00
When enabling NSS, disable OpenSSL. We used to link both libraries at once, but now that I'm working on TLS, there's nothing left to keep OpenSSL around for when NSS is enabled. Note that this patch causes a couple of places that still assumed OpenSSL to be disabled when NSS is enabled - tor-gencert - pbkdf2
2018-08-12 23:18:41 +02:00
if USE_NSS
# ...
else
build tor-cov-{resolve,gencert} This allows us to run tor-cov-gencert from chutney for coverage builds.
2015-03-22 04:21:08 +01:00
if COVERAGE_ENABLED
When enabling NSS, disable OpenSSL. We used to link both libraries at once, but now that I'm working on TLS, there's nothing left to keep OpenSSL around for when NSS is enabled. Note that this patch causes a couple of places that still assumed OpenSSL to be disabled when NSS is enabled - tor-gencert - pbkdf2
2018-08-12 23:18:41 +02:00
noinst_PROGRAMS += src/tools/tor-cov-gencert
build tor-cov-{resolve,gencert} This allows us to run tor-cov-gencert from chutney for coverage builds.
2015-03-22 04:21:08 +01:00
src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c
src_tools_tor_cov_gencert_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
src_tools_tor_cov_gencert_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
Make our crypto library symbolic in the makefiles.
2018-07-11 18:51:36 +02:00
src_tools_tor_cov_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB)
Refactor makefiles to keep list of internal libraries in one place. This change makes it possible for us to change the list of libraries more easily, without changing every single linker line.
2018-06-21 16:34:29 +02:00
src_tools_tor_cov_gencert_LDADD = \
$(TOR_CRYPTO_TESTING_LIBS) \
$(TOR_UTIL_TESTING_LIBS) \
Make our crypto library symbolic in the makefiles.
2018-07-11 18:51:36 +02:00
@TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \
Link GetAdaptersAddresses, rather than loading it on-demand. This function has been present since Windows XP.
2018-06-27 15:09:10 +02:00
@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
build tor-cov-{resolve,gencert} This allows us to run tor-cov-gencert from chutney for coverage builds.
2015-03-22 04:21:08 +01:00
endif
When enabling NSS, disable OpenSSL. We used to link both libraries at once, but now that I'm working on TLS, there's nothing left to keep OpenSSL around for when NSS is enabled. Note that this patch causes a couple of places that still assumed OpenSSL to be disabled when NSS is enabled - tor-gencert - pbkdf2
2018-08-12 23:18:41 +02:00
endif
Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't. 2) increased parallel build recursive make will max out at number of files in a directory, non-recursive make doesn't have such a limitation 3) Removal of duplicate information in make files, less error prone I've also slightly updated how we call AM_INIT_AUTOMAKE, as the way that was used was not only deprecated but will be *removed* in the next major automake release (1.13).... so probably best that we can continue to bulid tor without requiring old automake. (see http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html ) For more reasons why, see resources such as: http://miller.emu.id.au/pmiller/books/rmch/
2012-08-02 15:31:43 +02:00
Add a small library to emulate tor_run_main() with exec()
2017-10-19 01:34:19 +02:00
if BUILD_LIBTORRUNNER
noinst_LIBRARIES += src/tools/libtorrunner.a
Fix our build system to know the new locations of the src/or stuff
2018-07-05 22:52:12 +02:00
src_tools_libtorrunner_a_SOURCES = \
src/tools/tor_runner.c \
src/feature/api/tor_api.c
Add a small library to emulate tor_run_main() with exec()
2017-10-19 01:34:19 +02:00
endif
Reference in New Issue Copy Permalink