summaryrefslogtreecommitdiff
path: root/libc/stdlib
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-05-12 06:19:18 +0000
committerEric Andersen <andersen@codepoet.org>2001-05-12 06:19:18 +0000
commitf0da4aa1d854ca9c2a0e652dcb1d81bbf4d971f4 (patch)
tree39dd87100094d48dbc7e8557f26d5c02d331606f /libc/stdlib
parent249cb00d9f655778aa8a4519ee3e610a904d694d (diff)
Ok, this should finish off my massive ro-organization. The source
tree is less messy now (which helps), all libraries are placed into uClibc/lib when compiling, all libraries now use a consistant mechanism for being built, all libraries use a consistant naming scheme where the lib name includes the uClibc version number, which makes ldconfig happy and willing to work with us. -Erik
Diffstat (limited to 'libc/stdlib')
-rw-r--r--libc/stdlib/Makefile3
-rw-r--r--libc/stdlib/malloc-930716/Makefile3
-rw-r--r--libc/stdlib/malloc-simple/Makefile3
-rw-r--r--libc/stdlib/malloc/Makefile3
4 files changed, 4 insertions, 8 deletions
diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile
index 7bf0d5331..c8fde662b 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -20,9 +20,8 @@
# other sundry sources. Files within this library are copyright by their
# respective copyright holders.
-TOPDIR=../
+TOPDIR=../../
include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
DIRS = $(MALLOC)
ALL_SUBDIRS = malloc malloc-930716 malloc-simple
diff --git a/libc/stdlib/malloc-930716/Makefile b/libc/stdlib/malloc-930716/Makefile
index a4ae21798..208c1a68d 100644
--- a/libc/stdlib/malloc-930716/Makefile
+++ b/libc/stdlib/malloc-930716/Makefile
@@ -20,9 +20,8 @@
# other sundry sources. Files within this library are copyright by their
# respective copyright holders.
-TOPDIR=../../
+TOPDIR=../../../
include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
CSRC=calloc.c free.c malloc.c memalign.c morecore.c realloc.c valloc.c
COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/stdlib/malloc-simple/Makefile b/libc/stdlib/malloc-simple/Makefile
index cc2c132b2..a84578a0a 100644
--- a/libc/stdlib/malloc-simple/Makefile
+++ b/libc/stdlib/malloc-simple/Makefile
@@ -20,9 +20,8 @@
# other sundry sources. Files within this library are copyright by their
# respective copyright holders.
-TOPDIR=../../
+TOPDIR=../../../
include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
MSRC=alloc.c
MOBJ=malloc.o realloc.o free.o calloc.o malloc_dbg.o free_dbg.o calloc_dbg.o
diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile
index c2190dcdc..a280144d3 100644
--- a/libc/stdlib/malloc/Makefile
+++ b/libc/stdlib/malloc/Makefile
@@ -20,9 +20,8 @@
# other sundry sources. Files within this library are copyright by their
# respective copyright holders.
-TOPDIR=../../
+TOPDIR=../../../
include $(TOPDIR)Rules.mak
-LIBC=$(TOPDIR)libc.a
MSRC=alloc.c
MOBJ=malloc_dbg.o free_dbg.o calloc_dbg.o realloc_dbg.o