diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-02-18 18:14:32 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-02-18 18:14:32 +0000 |
| commit | 5d069a543b465a4646455d9cc251de936fde5c18 (patch) | |
| tree | df7015e6c06ee66e4c71beb6a6e24d5f06a9df00 /src/common/Makefile.am | |
| parent | b9a7649576357a195151ae5983287dbb87bdb8dc (diff) | |
| download | tor-5d069a543b465a4646455d9cc251de936fde5c18.tar.gz tor-5d069a543b465a4646455d9cc251de936fde5c18.zip | |
r18138@catbus: nickm | 2008-02-18 13:13:18 -0500
Try to make conditional include logic for openbsd malloc not warn on arma's computer. May fix bug 610.
svn:r13557
Diffstat (limited to 'src/common/Makefile.am')
| -rw-r--r-- | src/common/Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index de9b566e4e..28702bb10a 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -3,11 +3,14 @@ noinst_LIBRARIES = libor.a libor-crypto.a #CFLAGS = -Wall -Wpointer-arith -O2 -libor_a_SOURCES = log.c util.c compat.c container.c mempool.c -libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c - if USE_OPENBSD_MALLOC -libor_a_SOURCES += OpenBSD_malloc_Linux.c +libor_extra_source=OpenBSD_malloc_Linux.c +else +libor_extra_source= endif +libor_a_SOURCES = log.c util.c compat.c container.c mempool.c \ + $(libor_extra_source) +libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c + noinst_HEADERS = log.h crypto.h test.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h |