diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-20 09:25:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-20 09:27:04 -0400 |
| commit | 257b28077676f6d8a3c0d2beef37a9414c747de9 (patch) | |
| tree | 695c91b2cfe3cf0748f1221f2f3846b3d5cd1304 /src/trunnel | |
| parent | 178b738be0e1cb7a20dbb8b0d01eadc0cf6db0ba (diff) | |
| download | tor-257b28077676f6d8a3c0d2beef37a9414c747de9.tar.gz tor-257b28077676f6d8a3c0d2beef37a9414c747de9.zip | |
Simplify AM_CPPFLAGS include setup
We had accumulated a bunch of cruft here. Now let's only include
src and src/ext. (exception: src/trunnel is autogenerated code, and
need to include src/trunnel.)
This commit will break the build hard. The next commit will fix it.
Diffstat (limited to 'src/trunnel')
| -rw-r--r-- | src/trunnel/include.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/trunnel/include.am b/src/trunnel/include.am index b249fb302c..5a0a79c3a0 100644 --- a/src/trunnel/include.am +++ b/src/trunnel/include.am @@ -6,8 +6,6 @@ noinst_LIBRARIES += \ src/trunnel/libor-trunnel-testing.a endif -AM_CPPFLAGS += -I$(srcdir)/src/ext/trunnel -I$(srcdir)/src/trunnel - TRUNNELINPUTS = \ src/trunnel/ed25519_cert.trunnel \ src/trunnel/link_handshake.trunnel \ @@ -39,7 +37,8 @@ TRUNNELHEADERS = \ src/trunnel/channelpadding_negotiation.h src_trunnel_libor_trunnel_a_SOURCES = $(TRUNNELSOURCES) -src_trunnel_libor_trunnel_a_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) +src_trunnel_libor_trunnel_a_CPPFLAGS = \ + -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) -I$(top_srcdir)/src/trunnel if UNITTESTS_ENABLED src_trunnel_libor_trunnel_testing_a_SOURCES = $(TRUNNELSOURCES) @@ -54,4 +53,3 @@ noinst_HEADERS+= $(TRUNNELHEADERS) EXTRA_DIST += \ src/trunnel/README - |