diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2006-02-13 09:57:02 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2006-02-13 09:57:02 +0000 |
| commit | 4390d8e705e11eec6c2eed552ceea25277fdbde3 (patch) | |
| tree | c71e47cbc69b1b40dd222fcee66e36da1d340fd7 /libc/stdlib/malloc | |
| parent | 9f88426bbabbe3518c6017961f041e41ddbd3d27 (diff) | |
libc-{a,so,multi}-y replaced by libc-y covering common objects both in libc.a/libc.so, the diffs go into libc-static-y/libc-shared-y exclusively, add IMA to libc, don't use any MSRC anymore
Diffstat (limited to 'libc/stdlib/malloc')
| -rw-r--r-- | libc/stdlib/malloc/Makefile.in | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/libc/stdlib/malloc/Makefile.in b/libc/stdlib/malloc/Makefile.in index 55831c379..73e0d6419 100644 --- a/libc/stdlib/malloc/Makefile.in +++ b/libc/stdlib/malloc/Makefile.in @@ -2,35 +2,32 @@ # # Copyright (C) 2002-2003 NEC Electronics Corporation # Copyright (C) 2002-2003 Miles Bader <miles@gnu.org> -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC:= malloc.c calloc.c free.c realloc.c memalign.c \ +CSRC := malloc.c calloc.c free.c realloc.c memalign.c \ heap_alloc.c heap_alloc_at.c heap_free.c # Turn on malloc debugging if requested ifeq ($(UCLIBC_MALLOC_DEBUGGING),y) -CSRC+=malloc_debug.c heap_debug.c -CFLAGS+=-DMALLOC_DEBUGGING -DHEAP_DEBUGGING +CSRC += malloc_debug.c heap_debug.c +CFLAGS += -DMALLOC_DEBUGGING -DHEAP_DEBUGGING ifeq ($(UCLIBC_UCLINUX_BROKEN_MUNMAP),y) -CFLAGS+=-DMALLOC_MMB_DEBUGGING +CFLAGS += -DMALLOC_MMB_DEBUGGING endif endif -STDLIB_MALLOC_DIR:=$(top_srcdir)libc/stdlib/malloc -STDLIB_MALLOC_OUT:=$(top_builddir)libc/stdlib/malloc +STDLIB_MALLOC_DIR := $(top_srcdir)libc/stdlib/malloc +STDLIB_MALLOC_OUT := $(top_builddir)libc/stdlib/malloc -STDLIB_MALLOC_SRC:=$(patsubst %.c,$(STDLIB_MALLOC_DIR)/%.c,$(CSRC)) -STDLIB_MALLOC_OBJ:=$(patsubst %.c,$(STDLIB_MALLOC_OUT)/%.o,$(CSRC)) +STDLIB_MALLOC_SRC := $(patsubst %.c,$(STDLIB_MALLOC_DIR)/%.c,$(CSRC)) +STDLIB_MALLOC_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_OUT)/%.o,$(CSRC)) -libc-a-$(MALLOC)+=$(STDLIB_MALLOC_OBJ) -libc-so-$(MALLOC)+=$(STDLIB_MALLOC_OBJ:.o=.os) +libc-$(MALLOC) += $(STDLIB_MALLOC_OBJ) -libc-multi-$(MALLOC)+=$(STDLIB_MALLOC_SRC) - -objclean-y+=stdlib_malloc_objclean +objclean-y += stdlib_malloc_objclean stdlib_malloc_objclean: $(RM) $(STDLIB_MALLOC_OUT)/*.{o,os} |