From 0733ae3bcaa01d08932e73952d86939d0bc35366 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Wed, 31 Jan 2007 19:34:38 +0000 Subject: 2007-01-31 Kazunori Asayama * configure.host: Define stdio directory as a variable. * libc/Makefile.am: Define stdio related names as macros. * libc/configure.in: Add detection routine of stdio directory. * libc/Makefile.in: Regenerated. * libc/configure: Ditto. * libc/argz/Makefile.in: Ditto. * libc/ctype/Makefile.in: Ditto. * libc/errno/Makefile.in: Ditto. * libc/iconv/Makefile.in: Ditto. * libc/iconv/ccs/Makefile.in: Ditto. * libc/iconv/ccs/binary/Makefile.in: Ditto. * libc/iconv/ces/Makefile.in: Ditto. * libc/iconv/lib/Makefile.in: Ditto. * libc/locale/Makefile.in: Ditto. * libc/misc/Makefile.in: Ditto. * libc/posix/Makefile.in: Ditto. * libc/reent/Makefile.in: Ditto. * libc/search/Makefile.in: Ditto. * libc/signal/Makefile.in: Ditto. * libc/stdio/Makefile.in: Ditto. * libc/stdio64/Makefile.in: Ditto. * libc/stdlib/Makefile.in: Ditto. * libc/string/Makefile.in: Ditto. * libc/syscalls/Makefile.in: Ditto. * libc/time/Makefile.in: Ditto. * libc/unix/Makefile.in: Ditto. --- newlib/libc/Makefile.am | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'newlib/libc/Makefile.am') diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am index 69d2bce36..d4311142a 100644 --- a/newlib/libc/Makefile.am +++ b/newlib/libc/Makefile.am @@ -18,6 +18,10 @@ if HAVE_UNIX_DIR UNIX_SUBDIR = unix endif +if HAVE_STDIO_DIR +STDIO_SUBDIR = stdio +endif + if HAVE_STDIO64_DIR STDIO64_SUBDIR = stdio64 endif @@ -32,7 +36,7 @@ endif # The order of SUBDIRS is important for the integrated documentation. # Do not change the order without considering the doc impact. -SUBDIRS = argz stdlib ctype search stdio $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent \ +SUBDIRS = argz stdlib ctype search $(STDIO_SUBDIR) $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent \ $(extra_dir) errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) . noinst_DATA = $(CRT0) @@ -44,7 +48,7 @@ SUBLIBS = \ stdlib/libstdlib.$(aext) \ ctype/libctype.$(aext) \ search/libsearch.$(aext) \ - stdio/libstdio.$(aext) \ + $(LIBC_STDIO_LIB) \ $(LIBC_STDIO64_LIB) \ string/libstring.$(aext) \ $(LIBC_SIGNAL_LIB) \ @@ -66,7 +70,7 @@ SUBLIBS = \ stdlib/lib.$(aext) \ ctype/lib.$(aext) \ search/lib.$(aext) \ - stdio/lib.$(aext) \ + $(LIBC_STDIO_LIB) \ $(LIBC_STDIO64_LIB) \ string/lib.$(aext) \ $(LIBC_SIGNAL_LIB) \ @@ -119,7 +123,7 @@ sys/crt0.o: ; @true SUBDEFS = \ stdlib/stmp-def \ ctype/stmp-def \ - stdio/stmp-def \ + $(LIBC_STDIO_DEF) \ $(LIBC_STDIO64_DEF) \ string/stmp-def \ $(LIBC_SIGNAL_DEF) \ -- cgit v1.2.3