Move openbsd-malloc responsibility to lib/malloc

(Note that this is not believed to work, but we may as well have it
in the right place till we remove it)

diff --git a/src/common/include.am b/src/common/include.am
index 0a58a39ae00444e91d1dd1b3585fdcee7d27e7ab..8a2d2e114882e6b84216f0eb2aa0133d48c586e7 100644 (file)
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -11,12 +11,6 @@ endif
 
 EXTRA_DIST += src/common/Makefile.nmake
 
-if USE_OPENBSD_MALLOC
-libor_extra_source=src/ext/OpenBSD_malloc_Linux.c
-else
-libor_extra_source=
-endif
-
 LIBOR_A_SRC = \
   src/common/token_bucket.c                            \
   src/common/workqueue.c                               \

diff --git a/src/lib/malloc/include.am b/src/lib/malloc/include.am
index b4c5cae54d517b70304c6ff02a3a139f4c6d2b55..50de9cb736bcca0126e54401c4a70198a7a4021e 100644 (file)
--- a/src/lib/malloc/include.am
+++ b/src/lib/malloc/include.am
@@ -8,6 +8,10 @@ endif
 src_lib_libtor_malloc_a_SOURCES =                      \
        src/lib/malloc/util_malloc.c
 
+if USE_OPENBSD_MALLOC
+src_lib_libtor_malloc_a_SOURCES += src/ext/OpenBSD_malloc_Linux.c
+endif
+
 src_lib_libtor_malloc_testing_a_SOURCES = \
        $(src_lib_libtor_malloc_a_SOURCES)
 src_lib_libtor_malloc_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)