diff options
| -rw-r--r-- | changes/src_ext | 3 | ||||
| -rw-r--r-- | src/common/include.am | 3 | ||||
| -rw-r--r-- | src/ext/OpenBSD_malloc_Linux.c (renamed from src/common/OpenBSD_malloc_Linux.c) | 0 | ||||
| -rw-r--r-- | src/ext/eventdns.c (renamed from src/or/eventdns.c) | 0 | ||||
| -rw-r--r-- | src/ext/eventdns.h (renamed from src/or/eventdns.h) | 0 | ||||
| -rw-r--r-- | src/ext/ht.h (renamed from src/common/ht.h) | 0 | ||||
| -rw-r--r-- | src/ext/include.am | 12 | ||||
| -rw-r--r-- | src/ext/tinytest.c (renamed from src/test/tinytest.c) | 0 | ||||
| -rw-r--r-- | src/ext/tinytest.h (renamed from src/test/tinytest.h) | 0 | ||||
| -rw-r--r-- | src/ext/tinytest_demo.c (renamed from src/test/tinytest_demo.c) | 0 | ||||
| -rw-r--r-- | src/ext/tinytest_macros.h (renamed from src/test/tinytest_macros.h) | 0 | ||||
| -rw-r--r-- | src/include.am | 3 | ||||
| -rw-r--r-- | src/or/include.am | 3 | ||||
| -rw-r--r-- | src/test/include.am | 7 |
14 files changed, 21 insertions, 10 deletions
diff --git a/changes/src_ext b/changes/src_ext new file mode 100644 index 000000000..a1b2a2198 --- /dev/null +++ b/changes/src_ext @@ -0,0 +1,3 @@ + o Code refactoring: + - Source files taken from other packages now reside in src/ext; + previously they were scattered around the rest of Tor. diff --git a/src/common/include.am b/src/common/include.am index ba08aa7e5..7299a47af 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -9,7 +9,7 @@ EXTRA_DIST+= \ AM_CPPFLAGS += -I$(srcdir)/src/common -Isrc/common if USE_OPENBSD_MALLOC -libor_extra_source=src/common/OpenBSD_malloc_Linux.c +libor_extra_source=src/ext/OpenBSD_malloc_Linux.c else libor_extra_source= endif @@ -44,7 +44,6 @@ COMMONHEADERS = \ src/common/container.h \ src/common/crypto.h \ src/common/di_ops.h \ - src/common/ht.h \ src/common/memarea.h \ src/common/mempool.h \ src/common/procmon.h \ diff --git a/src/common/OpenBSD_malloc_Linux.c b/src/ext/OpenBSD_malloc_Linux.c index da8272981..da8272981 100644 --- a/src/common/OpenBSD_malloc_Linux.c +++ b/src/ext/OpenBSD_malloc_Linux.c diff --git a/src/or/eventdns.c b/src/ext/eventdns.c index 768693aba..768693aba 100644 --- a/src/or/eventdns.c +++ b/src/ext/eventdns.c diff --git a/src/or/eventdns.h b/src/ext/eventdns.h index 1c130b2a1..1c130b2a1 100644 --- a/src/or/eventdns.h +++ b/src/ext/eventdns.h diff --git a/src/common/ht.h b/src/ext/ht.h index 25156c416..25156c416 100644 --- a/src/common/ht.h +++ b/src/ext/ht.h diff --git a/src/ext/include.am b/src/ext/include.am new file mode 100644 index 000000000..97e7e46b4 --- /dev/null +++ b/src/ext/include.am @@ -0,0 +1,12 @@ + +AM_CPPFLAGS += -I$(srcdir)/src/ext -Isrc/ext + +EXTHEADERS = \ + src/ext/ht.h \ + src/ext/eventdns.h \ + src/ext/tinytest.h \ + src/ext/tinytest_macros.h + +noinst_HEADERS+= $(EXTHEADERS) + + diff --git a/src/test/tinytest.c b/src/ext/tinytest.c index 4d9afacce..4d9afacce 100644 --- a/src/test/tinytest.c +++ b/src/ext/tinytest.c diff --git a/src/test/tinytest.h b/src/ext/tinytest.h index bcac9f079..bcac9f079 100644 --- a/src/test/tinytest.h +++ b/src/ext/tinytest.h diff --git a/src/test/tinytest_demo.c b/src/ext/tinytest_demo.c index be95ce4c1..be95ce4c1 100644 --- a/src/test/tinytest_demo.c +++ b/src/ext/tinytest_demo.c diff --git a/src/test/tinytest_macros.h b/src/ext/tinytest_macros.h index 9ff69b1d5..9ff69b1d5 100644 --- a/src/test/tinytest_macros.h +++ b/src/ext/tinytest_macros.h diff --git a/src/include.am b/src/include.am index 965a49404..d0693e25b 100644 --- a/src/include.am +++ b/src/include.am @@ -1,6 +1,7 @@ +include src/ext/include.am include src/common/include.am include src/or/include.am include src/test/include.am include src/tools/include.am include src/win32/include.am -include src/config/include.am
\ No newline at end of file +include src/config/include.am diff --git a/src/or/include.am b/src/or/include.am index 90dea44ba..749206151 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -12,7 +12,7 @@ EXTRA_DIST+= src/or/ntmain.c src/or/or_sha1.i src/or/Makefile.nmake if USE_EXTERNAL_EVDNS evdns_source= else -evdns_source=src/or/eventdns.c +evdns_source=src/ext/eventdns.c endif src_or_libtor_a_SOURCES = \ @@ -110,7 +110,6 @@ ORHEADERS = \ src/or/dirvote.h \ src/or/dns.h \ src/or/dnsserv.h \ - src/or/eventdns.h \ src/or/eventdns_tor.h \ src/or/geoip.h \ src/or/hibernate.h \ 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 - |