diff options
Diffstat (limited to 'newlib/libc/Makefile.am')
| -rw-r--r-- | newlib/libc/Makefile.am | 82 |
1 files changed, 10 insertions, 72 deletions
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am index feba1b101..0937818c7 100644 --- a/newlib/libc/Makefile.am +++ b/newlib/libc/Makefile.am @@ -18,70 +18,49 @@ if HAVE_UNIX_DIR UNIX_SUBDIR = unix endif -if HAVE_STDIO64_DIR -STDIO64_SUBDIR = stdio64 -endif - -if ENABLE_NEWLIB_ICONV -NEWLIB_ICONV_DIRS = iconv -NEWLIB_ICONV_LIBS = iconv/ces/lib.$(aext) iconv/ccs/lib.$(aext) iconv/lib/lib.$(aext) -else -NEWLIB_ICONV_DIRS = -NEWLIB_ICONV_LIBS = -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 \ - $(extra_dir) errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) . +SUBDIRS = stdlib ctype stdio string $(SIGNAL_SUBDIR) time locale sys reent \ + errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) . noinst_DATA = $(CRT0) if USE_LIBTOOL noinst_LTLIBRARIES = libc.la SUBLIBS = \ - argz/libargz.$(aext) \ stdlib/libstdlib.$(aext) \ ctype/libctype.$(aext) \ - search/libsearch.$(aext) \ stdio/libstdio.$(aext) \ - $(LIBC_STDIO64_LIB) \ string/libstring.$(aext) \ $(LIBC_SIGNAL_LIB) \ time/libtime.$(aext) \ locale/liblocale.$(aext) \ + $(LIBC_SYS_LIB) \ reent/libreent.$(aext) \ - $(LIBC_EXTRA_LIB) \ errno/liberrno.$(aext) \ misc/libmisc.$(aext) \ + $(LIBC_MACHINE_LIB) \ $(LIBC_UNIX_LIB) \ $(LIBC_POSIX_LIB) \ - $(LIBC_SYSCALL_LIB) \ - $(LIBC_MACHINE_LIB) \ - $(LIBC_SYS_LIB) + $(LIBC_SYSCALL_LIB) else noinst_LIBRARIES = libc.a SUBLIBS = \ - argz/lib.$(aext) \ stdlib/lib.$(aext) \ ctype/lib.$(aext) \ - search/lib.$(aext) \ stdio/lib.$(aext) \ - $(LIBC_STDIO64_LIB) \ string/lib.$(aext) \ $(LIBC_SIGNAL_LIB) \ time/lib.$(aext) \ locale/lib.$(aext) \ + $(LIBC_SYS_LIB) \ reent/lib.$(aext) \ - $(LIBC_EXTRA_LIB) \ errno/lib.$(aext) \ misc/lib.$(aext) \ + $(LIBC_MACHINE_LIB) \ $(LIBC_UNIX_LIB) \ $(LIBC_POSIX_LIB) \ - $(LIBC_SYSCALL_LIB) \ - $(NEWLIB_ICONV_LIBS) \ - $(LIBC_MACHINE_LIB) \ - $(LIBC_SYS_LIB) + $(LIBC_SYSCALL_LIB) endif libc_la_LDFLAGS = -Xcompiler -nostdlib @@ -89,7 +68,6 @@ libc_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL libc_la_SOURCES = libc_la_LIBADD = $(SUBLIBS) -libc_la_DEPENDENCIES = $(SUBLIBS) else libc.a: $(SUBLIBS) rm -f $@ @@ -122,20 +100,14 @@ SUBDEFS = \ stdlib/stmp-def \ ctype/stmp-def \ stdio/stmp-def \ - $(LIBC_STDIO64_DEF) \ string/stmp-def \ $(LIBC_SIGNAL_DEF) \ time/stmp-def \ locale/stmp-def \ reent/stmp-def \ - $(LIBC_EXTRA_DEF) \ misc/stmp-def -libc.info: sigset.texi extra.texi stdio64.texi iconvset.texi \ - targetdep.tex $(SUBDEFS) - -libc.dvi: sigset.texi extra.texi stdio64.texi iconvset.texi \ - targetdep.tex $(SUBDEFS) +libc.info: sigset.texi targetdep.tex $(SUBDEFS) stmp-sigset: config.status if test -n "$(LIBC_SIGNAL_LIB)"; then \ @@ -148,39 +120,6 @@ stmp-sigset: config.status sigset.texi: stmp-sigset ; @true -stmp-iconvset: config.status - if test -n "$(NEWLIB_ICONV_LIBS)"; then \ - echo "@set ICONV" >tmp.texi; \ - else \ - echo "@clear ICONV" >tmp.texi; \ - fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi iconvset.texi - touch $@ - -iconvset.texi: stmp-iconvset ; @true - -stmp-extra: config.status - if test -n "$(LIBC_EXTRA_LIB)"; then \ - echo "@set EXTRA" >tmp.texi; \ - else \ - echo "@clear EXTRA" >tmp.texi; \ - fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi extra.texi - touch $@ - -extra.texi: stmp-extra ; @true - -stmp-stdio64: config.status - if test -n "$(LIBC_STDIO64_LIB)"; then \ - echo "@set STDIO64" >tmp.texi; \ - else \ - echo "@clear STDIO64" >tmp.texi; \ - fi - $(SHELL) $(newlib_basedir)/../move-if-change tmp.texi stdio64.texi - touch $@ - -stdio64.texi: stmp-stdio64 ; @true - stmp-targetdep: force rm -f tmp.texi targetdoc=`pwd`/tmp.texi; \ @@ -201,8 +140,7 @@ $(SUBDEFS): stmp-targetdep ; @true force: CLEANFILES = $(CRT0) \ - sigset.texi stmp-sigset extra.texi stmp-extra \ - stdio64.texi stmp-stdio64 tmp.texi targetdep.tex stmp-targetdep + sigset.texi stmp-sigset tmp.texi targetdep.tex stmp-targetdep ACLOCAL_AMFLAGS = -I .. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host |