diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/include.am | 2 | ||||
| -rw-r--r-- | src/lib/trace/debug.h (renamed from src/trace/debug.h) | 0 | ||||
| -rw-r--r-- | src/lib/trace/events.h (renamed from src/trace/events.h) | 0 | ||||
| -rw-r--r-- | src/lib/trace/include.am | 18 | ||||
| -rw-r--r-- | src/lib/trace/trace.c (renamed from src/trace/trace.c) | 0 | ||||
| -rw-r--r-- | src/lib/trace/trace.h (renamed from src/trace/trace.h) | 0 | ||||
| -rw-r--r-- | src/trace/include.am | 19 |
9 files changed, 22 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore index 14ab9f63c8..2716bac831 100644 --- a/.gitignore +++ b/.gitignore @@ -173,6 +173,7 @@ uptime-*.json /src/lib/libtor-ctime-testing.a /src/lib/libtor-err.a /src/lib/libtor-err-testing.a +/src/lib/libtor-trace.a # /src/or/ /src/or/Makefile diff --git a/Makefile.am b/Makefile.am index 5b229d073d..62c0e2a4a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,7 +71,7 @@ TOR_INTERNAL_LIBS = \ $(TOR_UTIL_LIBS) \ src/common/libor-event.a \ src/trunnel/libor-trunnel.a \ - src/trace/libor-trace.a + src/lib/libtor-trace.a # Variants of the above for linking the testing variant of tor (for coverage # and tests) @@ -82,7 +82,7 @@ TOR_INTERNAL_TESTING_LIBS = \ $(TOR_UTIL_TESTING_LIBS) \ src/common/libor-event-testing.a \ src/trunnel/libor-trunnel-testing.a \ - src/trace/libor-trace.a + src/lib/libtor-trace.a # All libraries used to link tor-cov diff --git a/src/include.am b/src/include.am index a7b266aa37..974d572e23 100644 --- a/src/include.am +++ b/src/include.am @@ -2,6 +2,7 @@ include src/ext/include.am include src/lib/err/include.am include src/lib/ctime/include.am include src/lib/compress/include.am +include src/lib/trace/include.am include src/common/include.am include src/trunnel/include.am include src/or/include.am @@ -11,4 +12,3 @@ include src/tools/include.am include src/win32/include.am include src/config/include.am include src/test/fuzz/include.am -include src/trace/include.am diff --git a/src/trace/debug.h b/src/lib/trace/debug.h index 0241f2ccf8..0241f2ccf8 100644 --- a/src/trace/debug.h +++ b/src/lib/trace/debug.h diff --git a/src/trace/events.h b/src/lib/trace/events.h index 761a0f4eb8..761a0f4eb8 100644 --- a/src/trace/events.h +++ b/src/lib/trace/events.h diff --git a/src/lib/trace/include.am b/src/lib/trace/include.am new file mode 100644 index 0000000000..6f10c98744 --- /dev/null +++ b/src/lib/trace/include.am @@ -0,0 +1,18 @@ + +noinst_LIBRARIES += \ + src/lib/libtor-trace.a + +TRACEHEADERS = \ + src/lib/trace/trace.h \ + src/lib/trace/events.h + +if USE_EVENT_TRACING_DEBUG +TRACEHEADERS += \ + src/lib/trace/debug.h +endif + +# Library source files. +src_lib_libtor_trace_a_SOURCES = \ + src/lib/trace/trace.c + +noinst_HEADERS+= $(TRACEHEADERS) diff --git a/src/trace/trace.c b/src/lib/trace/trace.c index b39a2bbc5c..b39a2bbc5c 100644 --- a/src/trace/trace.c +++ b/src/lib/trace/trace.c diff --git a/src/trace/trace.h b/src/lib/trace/trace.h index 2dd51aace1..2dd51aace1 100644 --- a/src/trace/trace.h +++ b/src/lib/trace/trace.h diff --git a/src/trace/include.am b/src/trace/include.am deleted file mode 100644 index 5e5eaaf9b5..0000000000 --- a/src/trace/include.am +++ /dev/null @@ -1,19 +0,0 @@ - -noinst_LIBRARIES += \ - src/trace/libor-trace.a -LIBOR_TRACE_A_SOURCES = \ - src/trace/trace.c - -TRACEHEADERS = \ - src/trace/trace.h \ - src/trace/events.h - -if USE_EVENT_TRACING_DEBUG -TRACEHEADERS += \ - src/trace/debug.h -endif - -# Library source files. -src_trace_libor_trace_a_SOURCES = $(LIBOR_TRACE_A_SOURCES) - -noinst_HEADERS+= $(TRACEHEADERS) |