torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/feature15053'

Browse Source
This commit is contained in:
Nick Mathewson
2015-03-18 14:27:00 -04:00
parent 9bdce9d4e5 21fd94ddb8
commit 54d6e5e71e
22 changed files with 98 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/include.am
+2 -4
View File
@@ -11,9 +11,7 @@ noinst_LIBRARIES += \
src/common/libor-event-testing.a
endif
EXTRA_DIST+= \
src/common/common_sha1.i \
src/common/Makefile.nmake
EXTRA_DIST += src/common/Makefile.nmake
#CFLAGS = -Wall -Wpointer-arith -O2
AM_CPPFLAGS += -I$(srcdir)/src/common -Isrc/common -I$(srcdir)/src/ext/trunnel -I$(srcdir)/src/trunnel
@@ -135,7 +133,7 @@ COMMONHEADERS = \
noinst_HEADERS+= $(COMMONHEADERS)
DISTCLEANFILES+= src/common/common_sha1.i
CLEANFILES+= src/common/common_sha1.i
src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEADERS)
$(AM_V_GEN)if test "@SHA1SUM@" != none; then \