diff options
| author | Andrea Shepard <andrea@persephoneslair.org> | 2012-10-11 15:55:26 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@persephoneslair.org> | 2012-10-11 15:55:26 -0700 |
| commit | 3a33b1fe3bd7ba4cb1fff73f97ee722a2b127db5 (patch) | |
| tree | c86ddeca6cfbd47d8796de6b4014b690d5e902df /src/test/include.am | |
| parent | a45760b53b6aef609e3d48f9e0abb5e1550e44fb (diff) | |
| parent | 63f542a5c21103946177b5377cdf5d08e2e68849 (diff) | |
| download | tor-3a33b1fe3bd7ba4cb1fff73f97ee722a2b127db5.tar.gz tor-3a33b1fe3bd7ba4cb1fff73f97ee722a2b127db5.zip | |
Merge branch 'move_contrib_source' of git://git.torproject.org/nickm/tor
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/test/include.am b/src/test/include.am index 03fef23375..bdfe498d66 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -5,7 +5,7 @@ noinst_PROGRAMS+= src/test/test src/test/test-child src/test/bench src_test_AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ -DBINDIR="\"$(bindir)\"" \ - -I"$(top_srcdir)/src/or" + -I"$(top_srcdir)/src/or" -I"$(top_srcdir)/src/ext" # -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 @@ -24,7 +24,7 @@ src_test_test_SOURCES = \ src/test/test_replay.c \ src/test/test_util.c \ src/test/test_config.c \ - src/test/tinytest.c + src/ext/tinytest.c src_test_test_CPPFLAGS= $(src_test_AM_CPPFLAGS) @@ -48,8 +48,5 @@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-crypt @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ noinst_HEADERS+= \ - src/test/tinytest.h \ - src/test/tinytest_macros.h \ src/test/test.h - |