summaryrefslogtreecommitdiff
path: root/src/or/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-01 13:22:16 -0400
committerNick Mathewson <nickm@torproject.org>2017-11-01 13:22:16 -0400
commitef25f957e7912491ced116733e699ee341f2dadc (patch)
tree5764fb29363c8a75f2e34833caee590c7f2eeb54 /src/or/include.am
parent9635843342cb98340a965c40d9afcbe69c8d12df (diff)
parent221f5238aed47f4436916a1da5c6f0423c7fe3e1 (diff)
downloadtor-ef25f957e7912491ced116733e699ee341f2dadc.tar.gz
tor-ef25f957e7912491ced116733e699ee341f2dadc.zip
Merge branch 'tor_api_squashed'
Diffstat (limited to 'src/or/include.am')
-rw-r--r--src/or/include.am11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/or/include.am b/src/or/include.am
index 3ff71d5ad7..b783f4855a 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -51,6 +51,7 @@ LIBTOR_A_SOURCES = \
src/or/geoip.c \
src/or/entrynodes.c \
src/or/ext_orport.c \
+ src/or/git_revision.c \
src/or/hibernate.c \
src/or/hs_cache.c \
src/or/hs_cell.c \
@@ -105,6 +106,7 @@ LIBTOR_A_SOURCES = \
src/or/statefile.c \
src/or/status.c \
src/or/torcert.c \
+ src/or/tor_api.c \
src/or/onion_ntor.c \
$(tor_platform_source)
@@ -190,6 +192,7 @@ ORHEADERS = \
src/or/fp_pair.h \
src/or/geoip.h \
src/or/entrynodes.h \
+ src/or/git_revision.h \
src/or/hibernate.h \
src/or/hs_cache.h \
src/or/hs_cell.h \
@@ -244,9 +247,13 @@ ORHEADERS = \
src/or/scheduler.h \
src/or/statefile.h \
src/or/status.h \
- src/or/torcert.h
+ src/or/torcert.h \
+ src/or/tor_api_internal.h
-noinst_HEADERS+= $(ORHEADERS) micro-revision.i
+# This may someday want to be an installed file?
+noinst_HEADERS += src/or/tor_api.h
+
+noinst_HEADERS += $(ORHEADERS) micro-revision.i
micro-revision.i: FORCE
$(AM_V_at)rm -f micro-revision.tmp; \