diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:17:30 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:17:30 -0700 |
| commit | aae3eb9256affb18cff589b52ee26e0a4e557bbd (patch) | |
| tree | 003711a54e7dfbde0b50979e2942fd3e0d3451c8 /libc/stdlib/malloc | |
| parent | ef18cfe8ebab25f5ef92e81956f50e2dc57df602 (diff) | |
| parent | 2864786ad884369ab5397be864e9f43d32bc2726 (diff) | |
Merge commit 'origin/master' into nptl
Conflicts:
Makefile.in
extra/Configs/Config.in
libc/sysdeps/linux/common/bits/kernel-features.h
libc/sysdeps/linux/common/poll.c
libc/sysdeps/linux/common/sysdep.h
libc/sysdeps/linux/sh/sysdep.h
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/stdlib/malloc')
| -rw-r--r-- | libc/stdlib/malloc/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/stdlib/malloc/Makefile.in b/libc/stdlib/malloc/Makefile.in index aff48a9ec..642570c95 100644 --- a/libc/stdlib/malloc/Makefile.in +++ b/libc/stdlib/malloc/Makefile.in @@ -29,9 +29,9 @@ STDLIB_MALLOC_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_OUT)/%.o,$(CSRC)) libc-$(MALLOC) += $(STDLIB_MALLOC_OBJ) -objclean-y += stdlib_malloc_clean +objclean-y += CLEAN_libc/stdlib/malloc -stdlib_malloc_clean: +CLEAN_libc/stdlib/malloc: $(do_rm) $(addprefix $(STDLIB_MALLOC_OUT)/*., o os) malloc.o free.o realloc.o memalign.o: malloc.h |