nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 21:53:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
5d43a15720
tor/src/or/Makefile.am

157 lines
3.4 KiB
Makefile
Raw Normal View History

move the tor program back to usr/bin/ svn:r1119
2004-02-25 07:41:21 +01:00
bin_PROGRAMS = tor
Move testing code into new src/test directory.
2009-09-22 18:31:15 +02:00
noinst_LIBRARIES = libtor.a
added automake/autoconf support. When in doubt, "aclocal && autoconf && autoheader && automake" from the top dir. svn:r10
2002-06-29 01:26:42 +02:00
r14940@catbus: nickm | 2007-09-06 13:22:26 -0400 Move NT services code into its own C file. Probably will not build happily on win32 yet; more hacking needed. svn:r11388
2007-09-06 19:42:05 +02:00
if BUILD_NT_SERVICES
r15077@catbus: nickm | 2007-09-15 14:04:19 -0400 Oops; make Makefile.am work on mingw again. svn:r11445
2007-09-15 20:06:23 +02:00
tor_platform_source=ntmain.c
r14940@catbus: nickm | 2007-09-06 13:22:26 -0400 Move NT services code into its own C file. Probably will not build happily on win32 yet; more hacking needed. svn:r11388
2007-09-06 19:42:05 +02:00
else
r15056@catbus: nickm | 2007-09-12 13:15:19 -0400 Try to fix an automake problem by renaming a variable. svn:r11432
2007-09-12 19:17:03 +02:00
tor_platform_source=
r14940@catbus: nickm | 2007-09-06 13:22:26 -0400 Move NT services code into its own C file. Probably will not build happily on win32 yet; more hacking needed. svn:r11388
2007-09-06 19:42:05 +02:00
endif
Command-line option to dump SHA1 digests of all source files. Now, when you call tor --digests, it dumps the SHA1 digest of each source file that Tor was built with. We support both 'sha1sum' and 'openssl sha1'. If the user is building from a tarball and they haven't edited anything, they don't need any program that calculates SHA1. If they _have_ modified a file but they don't have a program to calculate SHA1, we try to build so we do not output digests.
2009-01-04 03:43:05 +01:00
EXTRA_DIST=ntmain.c or_sha1.i
r14940@catbus: nickm | 2007-09-06 13:22:26 -0400 Move NT services code into its own C file. Probably will not build happily on win32 yet; more hacking needed. svn:r11388
2007-09-06 19:42:05 +02:00
Update Tor to use Libevent 2.0 APIs when available. This patch adds a new compat_libevent.[ch] set of files, and moves our Libevent compatibility and utilitity functions there. We build them into a separate .a so that nothing else in src/commmon depends on Libevent (partially fixing bug 507). Also, do not use our own built-in evdns copy when we have Libevent 2.0, whose evdns is finally good enough (thus fixing Bug 920).
2009-06-04 07:05:23 +02:00
if USE_EXTERNAL_EVDNS
evdns_source=
else
evdns_source=eventdns.c
endif
Split long lines in configure.in and Makefile.am files Having very long single lines with lots and lots of things in them tends to make files hard to diff and hard to merge. Since our tools are one-line-at-a-time, we should try to construct lists that way too, within reason. This incidentally turned up a few headers in configure.in that we were for some reason searching for twice.
2010-11-11 20:22:48 +01:00
libtor_a_SOURCES = \
buffers.c \
circuitbuild.c \
circuitlist.c \
circuituse.c \
command.c \
config.c \
connection.c \
connection_edge.c \
connection_or.c \
control.c \
cpuworker.c \
directory.c \
dirserv.c \
dirvote.c \
dns.c \
dnsserv.c \
geoip.c \
hibernate.c \
main.c \
microdesc.c \
networkstatus.c \
nodelist.c \
onion.c \
policies.c \
reasons.c \
relay.c \
rendclient.c \
rendcommon.c \
rendmid.c \
rendservice.c \
rephist.c \
router.c \
routerlist.c \
routerparse.c \
$(evdns_source) \
$(tor_platform_source) \
config_codedigest.c
Update Tor to use Libevent 2.0 APIs when available. This patch adds a new compat_libevent.[ch] set of files, and moves our Libevent compatibility and utilitity functions there. We build them into a separate .a so that nothing else in src/commmon depends on Libevent (partially fixing bug 507). Also, do not use our own built-in evdns copy when we have Libevent 2.0, whose evdns is finally good enough (thus fixing Bug 920).
2009-06-04 07:05:23 +02:00
Move testing code into new src/test directory.
2009-09-22 18:31:15 +02:00
#libtor_a_LIBADD = ../common/libor.a ../common/libor-crypto.a \
# ../common/libor-event.a
tor_SOURCES = tor_main.c
added automake/autoconf support. When in doubt, "aclocal && autoconf && autoheader && automake" from the top dir. svn:r10
2002-06-29 01:26:42 +02:00
r14702@tombo: nickm | 2007-11-04 15:48:56 -0500 Define SHARE_DATADIR, LOCALSTATEDIR, and BINDIR in Makefile.am as autoconf recommends. Do not move CONFDIR yet, since we seem to support overriding it in a weird way. Resolves bug 542. svn:r12376
2007-11-04 21:49:02 +01:00
AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
-DLOCALSTATEDIR="\"$(localstatedir)\"" \
-DBINDIR="\"$(bindir)\""
r12611@catbus: nickm | 2007-04-30 22:49:00 -0400 For reasons which make sense to somebody, I'm sure, mingw gcc wants the libraries to appear at the end of the command line. This is done by specifying them with LDADD in Makefile.am, not LDFLAGS. If anybody can explain to me why mingw thinks "gcc -o foo foo.o -lbar" is fine, whereas "gcc -lbar -o foo foo.o" is Doubleplusbad UnMingwThink, I'd quite appreciate it. Until then, I'll just do what seems to work, and hope we don't blunder across any other great slumbering cthonian deities of arbitrary syntax. svn:r10082
2007-05-01 04:53: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.
Add magic to end of C files to make emacs happy; split test invocation into separate file. svn:r224
2003-04-07 04:12:02 +02:00
Fix build with automake 1.6 automake 1.6 doesn't like using a conditional += to add stuff to foo_LDADD. Instead you need to conditionally define a variable, then non-conditionally put that variable in foo_LDADD.
2010-03-09 05:24:24 +01:00
if USE_BUFFEREVENTS
levent_openssl_lib = -levent_openssl
else
levent_openssl_lib =
endif
r12611@catbus: nickm | 2007-04-30 22:49:00 -0400 For reasons which make sense to somebody, I'm sure, mingw gcc wants the libraries to appear at the end of the command line. This is done by specifying them with LDADD in Makefile.am, not LDFLAGS. If anybody can explain to me why mingw thinks "gcc -o foo foo.o -lbar" is fine, whereas "gcc -lbar -o foo foo.o" is Doubleplusbad UnMingwThink, I'd quite appreciate it. Until then, I'll just do what seems to work, and hope we don't blunder across any other great slumbering cthonian deities of arbitrary syntax. svn:r10082
2007-05-01 04:53:32 +02:00
tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@
Move testing code into new src/test directory.
2009-09-22 18:31:15 +02:00
tor_LDADD = ./libtor.a ../common/libor.a ../common/libor-crypto.a \
Update Tor to use Libevent 2.0 APIs when available. This patch adds a new compat_libevent.[ch] set of files, and moves our Libevent compatibility and utilitity functions there. We build them into a separate .a so that nothing else in src/commmon depends on Libevent (partially fixing bug 507). Also, do not use our own built-in evdns copy when we have Libevent 2.0, whose evdns is finally good enough (thus fixing Bug 920).
2009-06-04 07:05:23 +02:00
../common/libor-event.a \
Fix build with automake 1.6 automake 1.6 doesn't like using a conditional += to add stuff to foo_LDADD. Instead you need to conditionally define a variable, then non-conditionally put that variable in foo_LDADD.
2010-03-09 05:24:24 +01:00
@TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
@TOR_LIB_WS32@ @TOR_LIB_GDI@ $(levent_openssl_lib)
Get SSL connections and linked connections working with bufferevents. Clients are now verified to work and build circuits correctly. There are still a few warnings given here and there that I need to look into.
2009-08-14 20:34:16 +02:00
Split long lines in configure.in and Makefile.am files Having very long single lines with lots and lots of things in them tends to make files hard to diff and hard to merge. Since our tools are one-line-at-a-time, we should try to construct lists that way too, within reason. This incidentally turned up a few headers in configure.in that we were for some reason searching for twice.
2010-11-11 20:22:48 +01:00
noinst_HEADERS = \
buffers.h \
circuitbuild.h \
circuitlist.h \
circuituse.h \
command.h \
config.h \
connection.h \
connection_edge.h \
connection_or.h \
control.h \
cpuworker.h \
directory.h \
dirserv.h \
dirvote.h \
dns.h \
dnsserv.h \
eventdns.h \
eventdns_tor.h \
geoip.h \
hibernate.h \
main.h \
microdesc.h \
networkstatus.h \
nodelist.h \
ntmain.h \
onion.h \
or.h \
policies.h \
reasons.h \
relay.h \
rendclient.h \
rendcommon.h \
rendmid.h \
rendservice.h \
rephist.h \
router.h \
routerlist.h \
routerparse.h \
micro-revision.i
added automake/autoconf support. When in doubt, "aclocal && autoconf && autoheader && automake" from the top dir. svn:r10
2002-06-29 01:26:42 +02:00
Include the *_sha1.i files in their own *_codedigest.c files. This way we do not need to rebuild util.c and/or config.c whenever any unrelated source file in src/common or src/or has changed.
2009-05-08 18:35:36 +02:00
config_codedigest.o: or_sha1.i
Command-line option to dump SHA1 digests of all source files. Now, when you call tor --digests, it dumps the SHA1 digest of each source file that Tor was built with. We support both 'sha1sum' and 'openssl sha1'. If the user is building from a tarball and they haven't edited anything, they don't need any program that calculates SHA1. If they _have_ modified a file but they don't have a program to calculate SHA1, we try to build so we do not output digests.
2009-01-04 03:43:05 +01:00
A hack I've been wanting for a while: when building a -dev version from an SVN repository, use the current svn revision in the platform string and in the output of --version. svn:r9976
2007-04-17 01:56:31 +02:00
tor_main.o: micro-revision.i
r14006@kushana: nickm | 2007-08-14 09:34:28 -0400 re-enable version checking svn:r11101
2007-08-14 15:34:41 +02:00
micro-revision.i: FORCE
Add the first 8 bytes of the git commit digest to our versions. Note that unlike subversion revision numbers, it isn't meaningful to compare these for anything but equality. We define a sort-order anyway, in case one of these accidentally slips into a recommended-versions list.
2009-06-12 19:38:37 +02:00
@rm -f micro-revision.tmp; \
if test -d ../../.git && test -x "`which git 2>&1;true`"; then \
HASH="`git rev-parse --short=16 HEAD`"; \
echo \"$$HASH\" > micro-revision.tmp; \
fi; \
if test ! -f micro-revision.tmp ; then \
if test ! -f micro-revision.i ; then \
echo '""' > micro-revision.i; \
fi; \
elif test ! -f micro-revision.i || \
r13139@catbus: nickm | 2007-06-01 14:02:40 -0400 Add some ;trues, and tabify. svn:r10441
2007-06-01 20:02:41 +02:00
test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \
Add the first 8 bytes of the git commit digest to our versions. Note that unlike subversion revision numbers, it isn't meaningful to compare these for anything but equality. We define a sort-order anyway, in case one of these accidentally slips into a recommended-versions list.
2009-06-12 19:38:37 +02:00
mv micro-revision.tmp micro-revision.i; \
r13139@catbus: nickm | 2007-06-01 14:02:40 -0400 Add some ;trues, and tabify. svn:r10441
2007-06-01 20:02:41 +02:00
fi; true
A hack I've been wanting for a while: when building a -dev version from an SVN repository, use the current svn revision in the platform string and in the output of --version. svn:r9976
2007-04-17 01:56:31 +02:00
Move testing code into new src/test directory.
2009-09-22 18:31:15 +02:00
or_sha1.i: $(tor_SOURCES)
Command-line option to dump SHA1 digests of all source files. Now, when you call tor --digests, it dumps the SHA1 digest of each source file that Tor was built with. We support both 'sha1sum' and 'openssl sha1'. If the user is building from a tarball and they haven't edited anything, they don't need any program that calculates SHA1. If they _have_ modified a file but they don't have a program to calculate SHA1, we try to build so we do not output digests.
2009-01-04 03:43:05 +01:00
if test "@SHA1SUM@" != none; then \
Move testing code into new src/test directory.
2009-09-22 18:31:15 +02:00
@SHA1SUM@ $(tor_SOURCES) | @SED@ -n 's/^\(.*\)$$/"\1\\n"/p' > or_sha1.i; \
Command-line option to dump SHA1 digests of all source files. Now, when you call tor --digests, it dumps the SHA1 digest of each source file that Tor was built with. We support both 'sha1sum' and 'openssl sha1'. If the user is building from a tarball and they haven't edited anything, they don't need any program that calculates SHA1. If they _have_ modified a file but they don't have a program to calculate SHA1, we try to build so we do not output digests.
2009-01-04 03:43:05 +01:00
elif test "@OPENSSL@" != none; then \
Move testing code into new src/test directory.
2009-09-22 18:31:15 +02:00
@OPENSSL@ sha1 $(tor_SOURCES) | @SED@ -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > or_sha1.i; \
Command-line option to dump SHA1 digests of all source files. Now, when you call tor --digests, it dumps the SHA1 digest of each source file that Tor was built with. We support both 'sha1sum' and 'openssl sha1'. If the user is building from a tarball and they haven't edited anything, they don't need any program that calculates SHA1. If they _have_ modified a file but they don't have a program to calculate SHA1, we try to build so we do not output digests.
2009-01-04 03:43:05 +01:00
else \
rm or_sha1.i; \
touch or_sha1.i; \
fi
Fix 'make distcheck' We were leaving doc/config.log and src/or/micro-revision.i in place during a make clean. Fix that.
2010-08-03 00:48:59 +02:00
CLEANFILES = micro-revision.i
r12615@catbus: nickm | 2007-05-01 09:48:45 -0400 Only replace micro-revision.i if it changes. svn:r10085
2007-05-01 15:48:49 +02:00
#Dummy target to ensure that micro-revision.i _always_ gets built.
A hack I've been wanting for a while: when building a -dev version from an SVN repository, use the current svn revision in the platform string and in the output of --version. svn:r9976
2007-04-17 01:56:31 +02:00
FORCE:
Reference in New Issue Copy Permalink