From 6737908f74ff566748864548cf35bb1da8e64af6 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 31 Oct 2002 18:20:21 +0000 Subject: Ok, this commit is _huge_ and its gonna change the world. I've been working on a new config system on and off for about 6 months now, but I've never been fully satisfied. Well, I'm finally am happy with the new config system, so here it is. This completely removes the old uClibc configuration system, and replaces it with an entirely new system based on LinuxKernelConf, from http://www.xs4all.nl/~zippel/lc/ As it turns out, Linus has just merged LinuxKernelConf into Linux 2.5.45, so it looks like I made the right choice. I have thus far updated only x86. I'll be updating the other architectures shortly. -Erik --- libc/stdlib/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'libc/stdlib/Makefile') diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile index aa311afcb..5bf12b322 100644 --- a/libc/stdlib/Makefile +++ b/libc/stdlib/Makefile @@ -24,15 +24,21 @@ TOPDIR=../../ include $(TOPDIR)Rules.mak -DIRS = $(MALLOC) -ALL_SUBDIRS = malloc malloc-930716 +DIRS:= +ifeq ($(MALLOC),y) + DIRS+=malloc +endif +ifeq ($(MALLOC_930716),y) + DIRS+=malloc-930716 +endif + MSRC = stdlib.c MOBJ = abs.o labs.o atoi.o atol.o strtol.o strtoul.o _stdlib_strto_l.o \ qsort.o bsearch.o MOBJ += llabs.o atoll.o strtoll.o strtoull.o _stdlib_strto_ll.o -ifeq ($(HAS_WCHAR),true) +ifeq ($(UCLIBC_HAS_WCHAR),y) MOBJ += mblen.o mbtowc.o wctomb.o mbstowcs.o wcstombs.o \ _stdlib_mb_cur_max.o endif @@ -46,7 +52,7 @@ CSRC = abort.c getenv.c mkdtemp.c mktemp.c realpath.c mkstemp.c mkstemp64.c \ drand48_r.c erand48.c erand48_r.c jrand48.c jrand48_r.c lrand48.c \ lrand48_r.c mrand48.c mrand48_r.c nrand48.c nrand48_r.c rand_r.c \ srand48.c srand48_r.c calloc.c valloc.c -ifeq ($(HAS_FLOATING_POINT),true) +ifeq ($(UCLIBC_HAS_FLOATS),y) CSRC += strtod.c strtof.c strtold.c endif COBJS=$(patsubst %.c,%.o, $(CSRC)) -- cgit v1.2.3