Move trace into its own library in libs.

Apparently it has no testing variant.

diff --git a/.gitignore b/.gitignore
index 14ab9f63c864b1c67d4325fa2d40a563f8d55551..2716bac8310c3a23b6172e68914e327e5a6e25c3 100644 (file)
--- 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 5b229d073d87c2716fea89dba7eecc6407ed5cec..62c0e2a4a1a05fb5e78d7002f74b7b141c10131c 100644 (file)
--- 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 a7b266aa3723ea0a9bb85b78926490e7d6c507a5..974d572e2388b6ee331ca6eace9dabf3a048e740 100644 (file)
--- 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
similarity index 100%
rename from src/trace/debug.h
rename to src/lib/trace/debug.h

diff --git a/src/trace/events.h b/src/lib/trace/events.h
similarity index 100%
rename from src/trace/events.h
rename to src/lib/trace/events.h

diff --git a/src/lib/trace/include.am b/src/lib/trace/include.am
new file mode 100644 (file)
index 0000000..6f10c98
--- /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
similarity index 100%
rename from src/trace/trace.c
rename to src/lib/trace/trace.c

diff --git a/src/trace/trace.h b/src/lib/trace/trace.h
similarity index 100%
rename from src/trace/trace.h
rename to src/lib/trace/trace.h

diff --git a/src/trace/include.am b/src/trace/include.am
deleted file mode 100644 (file)
index 5e5eaaf..0000000
--- 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)