summaryrefslogtreecommitdiff
path: root/libc/stdlib
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-02-01 12:28:54 -0800
committerKhem Raj <raj.khem@gmail.com>2010-02-01 12:28:54 -0800
commit9e22545a13d62299c59b048ae5923bf6da14ff9f (patch)
tree2aab233cda445781073c1f7f9dec154b867aa139 /libc/stdlib
parente999106d1b95e63283e9bb8246e5c34e9c1e85f7 (diff)
parent22de495da40d7649eb28fdfc70ce1d5f3b6572ea (diff)
Merge commit 'origin/master' into nptl
Conflicts: libc/stdlib/Makefile.in Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'libc/stdlib')
-rw-r--r--libc/stdlib/Makefile.in51
1 files changed, 19 insertions, 32 deletions
diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in
index af8be6451..4fd095e58 100644
--- a/libc/stdlib/Makefile.in
+++ b/libc/stdlib/Makefile.in
@@ -11,7 +11,7 @@ include $(top_srcdir)libc/stdlib/malloc/Makefile.in
include $(top_srcdir)libc/stdlib/malloc-simple/Makefile.in
include $(top_srcdir)libc/stdlib/malloc-standard/Makefile.in
-CSRC := \
+CSRC-y := \
abort.c getenv.c mkdtemp.c realpath.c mkstemp.c \
rand.c random.c random_r.c setenv.c div.c ldiv.c lldiv.c \
getpt.c drand48-iter.c jrand48.c \
@@ -41,54 +41,41 @@ CSRC += mktemp.c
endif
# multi source stdlib.c
-CSRC += abs.c labs.c atoi.c atol.c strtol.c strtoul.c _stdlib_strto_l.c \
+CSRC-y += abs.c labs.c atoi.c atol.c strtol.c strtoul.c _stdlib_strto_l.c \
qsort.c bsearch.c \
llabs.c atoll.c strtoll.c strtoull.c _stdlib_strto_ll.c
# (aliases) strtoq.o strtouq.o
-ifeq ($(UCLIBC_HAS_FLOATS),y)
-CSRC += atof.c
-endif
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-CSRC += strtol_l.c strtoul_l.c _stdlib_strto_l_l.c \
+CSRC-$(UCLIBC_HAS_FLOATS) += atof.c
+CSRC-$(UCLIBC_HAS_XLOCALE) += strtol_l.c strtoul_l.c _stdlib_strto_l_l.c \
strtoll_l.c strtoull_l.c _stdlib_strto_ll_l.c
-endif
-ifeq ($(UCLIBC_HAS_WCHAR),y)
-CSRC += mblen.c mbtowc.c wctomb.c mbstowcs.c wcstombs.c \
+
+CSRC-$(UCLIBC_HAS_WCHAR) += mblen.c mbtowc.c wctomb.c mbstowcs.c wcstombs.c \
_stdlib_mb_cur_max.c _stdlib_wcsto_l.c _stdlib_wcsto_ll.c \
wcstol.c wcstoul.c wcstoll.c wcstoull.c
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-CSRC +=_stdlib_wcsto_l_l.c _stdlib_wcsto_ll_l.c \
+CSRC-$(if $(findstring yy,$(UCLIBC_HAS_WCHAR)$(UCLIBC_HAS_XLOCALE)),y) += \
+ _stdlib_wcsto_l_l.c _stdlib_wcsto_ll_l.c \
wcstol_l.c wcstoul_l.c wcstoll_l.c wcstoull_l.c
-endif
-endif
# multi source _strtod.c
-ifeq ($(UCLIBC_HAS_FLOATS),y)
-CSRC += strtod.c strtof.c strtold.c __strtofpmax.c __fp_range_check.c
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-CSRC += strtod_l.c strtof_l.c strtold_l.c __strtofpmax_l.c
-endif
-ifeq ($(UCLIBC_HAS_WCHAR),y)
-CSRC += wcstod.c wcstof.c wcstold.c __wcstofpmax.c
-ifeq ($(UCLIBC_HAS_XLOCALE),y)
-CSRC += wcstod_l.c wcstof_l.c wcstold_l.c __wcstofpmax_l.c
-endif
-endif
-endif
+CSRC-$(UCLIBC_HAS_FLOATS) += strtod.c strtof.c strtold.c __strtofpmax.c __fp_range_check.c
+CSRC-$(if $(findstring yy,$(UCLIBC_HAS_FLOATS)$(UCLIBC_HAS_XLOCALE)),y) += \
+ strtod_l.c strtof_l.c strtold_l.c __strtofpmax_l.c
+CSRC-$(if $(findstring yy,$(UCLIBC_HAS_FLOATS)$(UCLIBC_HAS_WCHAR)),y) += \
+ wcstod.c wcstof.c wcstold.c __wcstofpmax.c
+CSRC-$(if $(findstring yyy,$(UCLIBC_HAS_FLOATS)$(UCLIBC_HAS_WCHAR)$(UCLIBC_HAS_XLOCALE)),y) += \
+ wcstod_l.c wcstof_l.c wcstold_l.c __wcstofpmax_l.c
# (aliases) wcstoq.o wcstouq.o
# wcstod wcstof wcstold
# multi source _atexit.c
-CSRC += __cxa_atexit.c __cxa_finalize.c __exit_handler.c exit.c on_exit.c
-ifeq ($(COMPAT_ATEXIT),y)
-CSRC += old_atexit.c
-endif
+CSRC-y += __cxa_atexit.c __cxa_finalize.c __exit_handler.c exit.c on_exit.c
+CSRC-$(COMPAT_ATEXIT) += old_atexit.c
STDLIB_DIR := $(top_srcdir)libc/stdlib
STDLIB_OUT := $(top_builddir)libc/stdlib
-STDLIB_SRC := $(patsubst %.c,$(STDLIB_DIR)/%.c,$(CSRC))
-STDLIB_OBJ := $(patsubst %.c,$(STDLIB_OUT)/%.o,$(CSRC))
+STDLIB_SRC := $(patsubst %.c,$(STDLIB_DIR)/%.c,$(CSRC-y))
+STDLIB_OBJ := $(patsubst %.c,$(STDLIB_OUT)/%.o,$(CSRC-y))
libc-y += $(STDLIB_OBJ)
libc-static-y += $(STDLIB_OUT)/atexit.o $(STDLIB_OUT)/system.o