[or-cvs] r13557: Try to make conditional include logic for openbsd malloc not (in tor/trunk: . src/common)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-02-18 13:14:32 -0500 (Mon, 18 Feb 2008)
New Revision: 13557

Modified:
   tor/trunk/
   tor/trunk/src/common/Makefile.am
Log:
 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.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r18138] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/common/Makefile.am
===================================================================
--- tor/trunk/src/common/Makefile.am	2008-02-18 17:45:37 UTC (rev 13556)
+++ tor/trunk/src/common/Makefile.am	2008-02-18 18:14:32 UTC (rev 13557)
@@ -3,11 +3,14 @@
 
 #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