Merge branch 'remove_digests'

This commit is contained in:
Nick Mathewson
2015-04-01 13:53:03 -04:00
10 changed files with 7 additions and 74 deletions
-15
View File
@@ -61,7 +61,6 @@ LIBOR_A_SOURCES = \
src/common/log.c \
src/common/memarea.c \
src/common/util.c \
src/common/util_codedigest.c \
src/common/util_process.c \
src/common/sandbox.c \
src/common/workqueue.c \
@@ -133,17 +132,3 @@ COMMONHEADERS = \
noinst_HEADERS+= $(COMMONHEADERS)
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 \
(cd "$(srcdir)" && "@SHA1SUM@" $(src_common_libor_SOURCES) $(src_common_libor_crypto_a_SOURCES) $(COMMONHEADERS)) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > $@; \
elif test "@OPENSSL@" != none; then \
(cd "$(srcdir)" && "@OPENSSL@" sha1 $(src_common_libor_SOURCES) $(src_Common_libor_crypto_a_SOURCES) $(COMMONHEADERS)) | "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > $@; \
else \
rm $@; \
touch $@; \
fi
src/common/util_codedigest.o: src/common/common_sha1.i
-2
View File
@@ -573,8 +573,6 @@ STATIC int format_helper_exit_status(unsigned char child_state,
#endif
const char *libor_get_digests(void);
#define ARRAY_LENGTH(x) ((sizeof(x)) / sizeof(x[0]))
#endif
-13
View File
@@ -1,13 +0,0 @@
#include "util.h"
/** Return a string describing the digest of the source files in src/common/
*/
const char *
libor_get_digests(void)
{
return ""
#include "common_sha1.i"
;
}