nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-23 20:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove dead code related to the old tor-fw-helper

Browse Source 
This commit removes more code related to the old tor-fw-helper which was
removed in ticket 13338.

Closes ticket 21024.
This commit is contained in:
cypherpunks 2016-12-15 21:17:04 +00:00 committed by Nick Mathewson
parent 40ce7a83c4
commit d3c0b137af
3 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitignore vendored
View File

@ -94,11 +94,6 @@ uptime-*.json
/doc/tor.html /doc/tor.html
/doc/tor.html.in /doc/tor.html.in
/doc/tor.1.xml /doc/tor.1.xml
/doc/tor-fw-helper.1
/doc/tor-fw-helper.1.in
/doc/tor-fw-helper.html
/doc/tor-fw-helper.html.in
/doc/tor-fw-helper.1.xml
/doc/tor-gencert.1 /doc/tor-gencert.1
/doc/tor-gencert.1.in /doc/tor-gencert.1.in
/doc/tor-gencert.html /doc/tor-gencert.html
@ -214,12 +209,6 @@ uptime-*.json
/src/trunnel/libor-trunnel-testing.a /src/trunnel/libor-trunnel-testing.a
/src/trunnel/libor-trunnel.a /src/trunnel/libor-trunnel.a
# /src/tools/tor-fw-helper/
/src/tools/tor-fw-helper/tor-fw-helper
/src/tools/tor-fw-helper/tor-fw-helper.exe
/src/tools/tor-fw-helper/Makefile
/src/tools/tor-fw-helper/Makefile.in
# /src/win32/ # /src/win32/
/src/win32/Makefile /src/win32/Makefile
/src/win32/Makefile.in /src/win32/Makefile.in

3
configure.ac
View File

@ -208,9 +208,6 @@ AC_PATH_PROGS([A2X], [a2x a2x.py], none)
AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue") AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue")
AM_CONDITIONAL(USE_FW_HELPER, test "x$natpmp" = "xtrue" || test "x$upnp" = "xtrue")
AM_CONDITIONAL(NAT_PMP, test "x$natpmp" = "xtrue")
AM_CONDITIONAL(MINIUPNPC, test "x$upnp" = "xtrue")
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_CC_C99 AC_PROG_CC_C99

12
doc/include.am
View File

@ -12,17 +12,11 @@
# part of the source distribution, so that people without asciidoc can # part of the source distribution, so that people without asciidoc can
# just use the .1 and .html files. # just use the .1 and .html files.
base_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify all_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify
all_mans = $(base_mans)
if USE_FW_HELPER
install_mans = $(all_mans)
else
install_mans = $(base_mans)
endif
if USE_ASCIIDOC if USE_ASCIIDOC
nodist_man1_MANS = $(install_mans:=.1) nodist_man1_MANS = $(all_mans:=.1)
doc_DATA = $(install_mans:=.html) doc_DATA = $(all_mans:=.html)
html_in = $(all_mans:=.html.in) html_in = $(all_mans:=.html.in)
man_in = $(all_mans:=.1.in) man_in = $(all_mans:=.1.in)
txt_in = $(all_mans:=.1.txt) txt_in = $(all_mans:=.1.txt)