diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-11 17:19:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-11 17:22:03 -0400 |
| commit | 63f542a5c21103946177b5377cdf5d08e2e68849 (patch) | |
| tree | 6c8c7d20c0772be81b6ee08d61f48b56ed4eaacd /src/test/include.am | |
| parent | 7ea904cbc0acbe1575ff68700572da76e4e4b10d (diff) | |
| download | tor-63f542a5c21103946177b5377cdf5d08e2e68849.tar tor-63f542a5c21103946177b5377cdf5d08e2e68849.tar.gz | |
Move all externally maintained source files into src/ext
The rationale for treating these files differently is that we should
be checking upstream for changes as applicable, and merging changes
upstream as warranted.
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 03fef2337..bdfe498d6 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 - |