diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-18 14:27:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-18 14:27:00 -0400 |
| commit | 54d6e5e71e604ffedcb3c0a2aeff4b39bc9e37db (patch) | |
| tree | dc45202d8c3b636fd84abef68b28f252234fe01e /src/common/include.am | |
| parent | 9bdce9d4e5fd164b05e1ae87ab0f629d2cd38e42 (diff) | |
| parent | 21fd94ddb81327a339a942fb5d134cb6ebb5a998 (diff) | |
| download | tor-54d6e5e71e604ffedcb3c0a2aeff4b39bc9e37db.tar.gz tor-54d6e5e71e604ffedcb3c0a2aeff4b39bc9e37db.zip | |
Merge remote-tracking branch 'public/feature15053'
Diffstat (limited to 'src/common/include.am')
| -rw-r--r-- | src/common/include.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/common/include.am b/src/common/include.am index 5417cca5d8..ec4893594b 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -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 \ |