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

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