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

36 lines
1.3 KiB
Plaintext
Raw Normal View History

Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
bin_PROGRAMS+= src/app/tor
if COVERAGE_ENABLED
noinst_PROGRAMS+= src/app/tor-cov
endif
noinst_HEADERS += \
Move literally everything out of src/or This commit won't build yet -- it just puts everything in a slightly more logical place. The reasoning here is that "src/core" will hold the stuff that every (or nearly every) tor instance will need in order to do onion routing. Other features (including some necessary ones) will live in "src/feature". The "src/app" directory will hold the stuff needed to have Tor be an application you can actually run. This commit DOES NOT refactor the former contents of src/or into a logical set of acyclic libraries, or change any code at all. That will have to come in the future. We will continue to move things around and split them in the future, but I hope this lays a reasonable groundwork for doing so.
2018-07-05 22:31:38 +02:00
src/app/main/ntmain.h
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
Move literally everything out of src/or This commit won't build yet -- it just puts everything in a slightly more logical place. The reasoning here is that "src/core" will hold the stuff that every (or nearly every) tor instance will need in order to do onion routing. Other features (including some necessary ones) will live in "src/feature". The "src/app" directory will hold the stuff needed to have Tor be an application you can actually run. This commit DOES NOT refactor the former contents of src/or into a logical set of acyclic libraries, or change any code at all. That will have to come in the future. We will continue to move things around and split them in the future, but I hope this lays a reasonable groundwork for doing so.
2018-07-05 22:31:38 +02:00
src_app_tor_SOURCES = src/app/main/tor_main.c
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
# -L flags need to go in LDFLAGS. -l flags need to go in LDADD.
# This seems to matter nowhere but on windows, but I assure you that it
# matters a lot there, and is quite hard to debug if you forget to do it.
Make our crypto library symbolic in the makefiles.
2018-07-11 18:51:36 +02:00
src_app_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) @TOR_LDFLAGS_libevent@
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
src_app_tor_LDADD = $(TOR_INTERNAL_LIBS) \
$(rust_ldadd) \
Make our crypto library symbolic in the makefiles.
2018-07-11 18:51:36 +02:00
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \
Add support for patterns on %include #25140 Also adds generic tor_glob function to expand globs.
2020-06-03 23:09:42 +02:00
@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
@CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
trace: Add LTTng-UST interface support No probes at this point. They are per subsystem and thus in later commits. Part of #32910
2020-02-11 17:26:04 +01:00
@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ @TOR_TRACE_LIBS@
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
if COVERAGE_ENABLED
src_app_tor_cov_SOURCES = $(src_app_tor_SOURCES)
src_app_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
src_app_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
Make our crypto library symbolic in the makefiles.
2018-07-11 18:51:36 +02:00
src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) @TOR_LDFLAGS_libevent@
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
src_app_tor_cov_LDADD = $(TOR_INTERNAL_TESTING_LIBS) \
Make our crypto library symbolic in the makefiles.
2018-07-11 18:51:36 +02:00
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \
Add support for patterns on %include #25140 Also adds generic tor_glob function to expand globs.
2020-06-03 23:09:42 +02:00
@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
@CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
trace: Add LTTng-UST interface support No probes at this point. They are per subsystem and thus in later commits. Part of #32910
2020-02-11 17:26:04 +01:00
@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ @TOR_TRACE_LIBS@
Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor".
2018-07-05 22:04:32 +02:00
endif
Reference in New Issue Copy Permalink