diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-08-27 10:33:24 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-08-27 10:33:24 -0400 |
commit | 7795f42e4be2d04d3f40e227a094dbdce533b173 (patch) | |
tree | 9814500ff44228fb0ffa896c11f86d8b05140b3f /src/tools/Makefile.am | |
parent | b3b4f319367e1fb50ea99ba042ed60030e909c12 (diff) | |
parent | 09d90b1b65066e79dc6de59f2ffca9e28ab5e7ea (diff) | |
download | tor-7795f42e4be2d04d3f40e227a094dbdce533b173.tar tor-7795f42e4be2d04d3f40e227a094dbdce533b173.tar.gz |
Merge branch 'bug6524_nm'
Diffstat (limited to 'src/tools/Makefile.am')
-rw-r--r-- | src/tools/Makefile.am | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am deleted file mode 100644 index 35b0a41f5..000000000 --- a/src/tools/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -bin_PROGRAMS = tor-resolve tor-gencert -noinst_PROGRAMS = tor-checkkey - -tor_resolve_SOURCES = tor-resolve.c -tor_resolve_LDFLAGS = -tor_resolve_LDADD = ../common/libor.a @TOR_LIB_MATH@ @TOR_LIB_WS32@ - -tor_gencert_SOURCES = tor-gencert.c -tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ -tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a \ - @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ - -tor_checkkey_SOURCES = tor-checkkey.c -tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ -tor_checkkey_LDADD = ../common/libor.a ../common/libor-crypto.a \ - @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ - -SUBDIRS = tor-fw-helper -DIST_SUBDIRS = tor-fw-helper - |