Browse Source

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)
Nick Mathewson 5 years ago
parent
commit
947de40d19
2 changed files with 4 additions and 6 deletions
  1. 0 6
      src/common/include.am
  2. 4 0
      src/lib/malloc/include.am

+ 0 - 6
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				\

+ 4 - 0
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)