diff options
| author | cypherpunks <cypherpunks@torproject.org> | 2015-02-17 15:36:10 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-14 13:00:04 -0400 |
| commit | 17cbc4350f1b840c7f4878808c9610f7a7936592 (patch) | |
| tree | f86fafa9519996b67b8f1231a2041bae5e7e2669 /src | |
| parent | 4247ce99e5d9b7b2063df66cc808fac1f09fb799 (diff) | |
| download | tor-17cbc4350f1b840c7f4878808c9610f7a7936592.tar.gz tor-17cbc4350f1b840c7f4878808c9610f7a7936592.zip | |
Use output variables instead of relative paths.
Fixes the following rules in out-of-tree builds;
- check-spaces
- check-docs
- check-logs
- Doxygen
- coverage-html
And cleans up additional directories;
- coverage_html
- doc/doxygen
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/include.am | 9 | ||||
| -rw-r--r-- | src/test/include.am | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/or/include.am b/src/or/include.am index b44e1099dc..47746e22de 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -85,8 +85,9 @@ LIBTOR_A_SOURCES = \ src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES) src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) -#libtor_a_LIBADD = ../common/libor.a ../common/libor-crypto.a \ -# ../common/libor-event.a +#libtor_a_LIBADD = $(top_builddir)/common/libor.a \ +# $(top_builddir)/common/libor-crypto.a \ +# $(top_builddir)/common/libor-event.a src_or_tor_SOURCES = src/or/tor_main.c @@ -123,9 +124,9 @@ src_or_tor_cov_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ src/common/libor-event-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ -TESTING_TOR_BINARY = ./src/or/tor-cov +TESTING_TOR_BINARY = $(top_builddir)/src/or/tor-cov else -TESTING_TOR_BINARY = ./src/or/tor +TESTING_TOR_BINARY = $(top_builddir)/src/or/tor endif ORHEADERS = \ diff --git a/src/test/include.am b/src/test/include.am index 369bc1a77a..c56e887ca0 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -140,9 +140,9 @@ src_test_test_ntor_cl_AM_CPPFLAGS = \ NTOR_TEST_DEPS=src/test/test-ntor-cl if COVERAGE_ENABLED -CMDLINE_TEST_TOR = ./src/or/tor-cov +CMDLINE_TEST_TOR = $(top_builddir)/src/or/tor-cov else -CMDLINE_TEST_TOR = ./src/or/tor +CMDLINE_TEST_TOR = $(top_builddir)/src/or/tor endif noinst_PROGRAMS += src/test/test-bt-cl @@ -158,10 +158,10 @@ check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR) if USEPYTHON $(PYTHON) $(top_srcdir)/src/test/ntor_ref.py test-tor $(PYTHON) $(top_srcdir)/src/test/ntor_ref.py self-test - ./src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py - ./src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py + $(top_builddir)/src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py + $(top_builddir)/src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py endif - $(top_srcdir)/src/test/zero_length_keys.sh + $(SHELL) $(top_srcdir)/src/test/zero_length_keys.sh EXTRA_DIST += \ src/test/bt_test.py \ |