newlib: libc: move stdio multiplex logic from build to source files

Rather than define per-object rules in the Makefile, have small files
that define & include the right content.  This simplifies the build
rules, and makes understanding the source a little easier (imo) as it
makes all the subdirs behave the same: you have 1 source file and it
produces 1 object.  It's also about the same amount of boiler plate,
without having to define custom build rules that can fall out of sync.
Some of these rules were already unnecessary as they were compiling a
single source file into the same named object w/out custom flags, and
Automake handles that for us completely.

This will also be important as we merge the libc.a build into the top
dir since it relies on a single flat list of objects for overrides.

Also take the opportunity to clean up the unnecessary header deps in
here.  Automake provides dependency generation for free now.

16 files changed, 249 insertions, 502 deletions

diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am
index 538549c..6009aa7 100644
--- a/newlib/libc/stdio/Makefile.am
+++ b/newlib/libc/stdio/Makefile.am
@@ -192,33 +192,33 @@ endif !ELIX_LEVEL_2
 endif !ELIX_LEVEL_1
 
 if NEWLIB_NANO_FORMATTED_IO
-LIBADD_OBJS = \
-	%D%/$(lpfx)nano-vfprintf_float.o	\
-	%D%/$(lpfx)nano-svfprintf.o		\
-	%D%/$(lpfx)nano-svfscanf.o		\
-	%D%/$(lpfx)nano-vfprintf.o		\
-	%D%/$(lpfx)nano-vfprintf_i.o		\
-	%D%/$(lpfx)nano-vfscanf.o		\
-	%D%/$(lpfx)nano-vfscanf_i.o		\
-	%D%/$(lpfx)nano-vfscanf_float.o	\
-	%D%/$(lpfx)svfiwprintf.o		\
-	%D%/$(lpfx)svfwprintf.o		\
-	%D%/$(lpfx)vfiwprintf.o		\
-	%D%/$(lpfx)svfiwscanf.o		\
-	%D%/$(lpfx)svfwscanf.o		\
-	%D%/$(lpfx)vfiwscanf.o		\
-	%D%/$(lpfx)vfwscanf.o
+GENERAL_SOURCES += \
+	%D%/nano-vfprintf_float.c \
+	%D%/nano-svfprintf.c \
+	%D%/nano-svfscanf.c \
+	%D%/nano-vfprintf.c \
+	%D%/nano-vfprintf_i.c \
+	%D%/nano-vfscanf.c \
+	%D%/nano-vfscanf_i.c \
+	%D%/nano-vfscanf_float.c
 else
-LIBADD_OBJS = \
-	%D%/$(lpfx)svfiprintf.o $(lpfx)svfprintf.o \
-	%D%/$(lpfx)svfiscanf.o $(lpfx)svfscanf.o \
-	%D%/$(lpfx)vfiprintf.o \
-	%D%/$(lpfx)vfscanf.o $(lpfx)vfiscanf.o \
-	%D%/$(lpfx)svfiwprintf.o $(lpfx)svfwprintf.o \
-	%D%/$(lpfx)vfiwprintf.o \
-	%D%/$(lpfx)svfiwscanf.o $(lpfx)svfwscanf.o \
-	%D%/$(lpfx)vfiwscanf.o $(lpfx)vfwscanf.o
+GENERAL_SOURCES += \
+	%D%/svfiprintf.c \
+	%D%/svfprintf.c \
+	%D%/svfiscanf.c \
+	%D%/svfscanf.c \
+	%D%/vfiprintf.c \
+	%D%/vfscanf.c \
+	%D%/vfiscanf.c
 endif
+GENERAL_SOURCES += \
+	%D%/svfiwprintf.c \
+	%D%/svfwprintf.c \
+	%D%/vfiwprintf.c \
+	%D%/svfiwscanf.c \
+	%D%/svfwscanf.c \
+	%D%/vfiwscanf.c \
+	%D%/vfwscanf.c
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
@@ -226,194 +226,3 @@ lib_a_LIBADD = $(LIBADD_OBJS)
 lib_a_CFLAGS = $(AM_CFLAGS)
 lib_a_DEPENDENCIES = $(LIBADD_OBJS)
 LIB_COMPILE = $(AM_V_CC)$(COMPILE)
-
-# Though small footprint nano-formatted-IO implementation is used
-# when NEWLIB_NANO_FORMATTED_IO is enabled, we keep all rules for
-# the other implementation of formatted IO including all i-family
-# functions.  The object files in !NEWLIB_NANO_FORMATTED_IO version
-# implementation will be neither compiled nor archived into final
-# library, because they are not depended on by final makefile target.
-
-if NEWLIB_NANO_FORMATTED_IO
-# Rules compiling small-footprint nano-formatted-io implementation.
-$(lpfx)nano-vfprintf.o: nano-vfprintf.c
-	%D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfprintf.c -o $@
-
-$(lpfx)nano-vfprintf_i.o: nano-vfprintf_i.c
-	%D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfprintf_i.c -o $@
-
-$(lpfx)nano-vfprintf_float.o: nano-vfprintf_float.c
-	%D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfprintf_float.c -o $@
-
-$(lpfx)nano-svfprintf.o: nano-vfprintf.c
-	%D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/nano-vfprintf.c -o $@
-endif
-
-# This rule is needed so that libtool compiles vfiprintf before vfprintf.
-# Otherwise libtool moves vfprintf.o and subsequently can't find it.
-
-$(lpfx)vfiprintf.o: vfprintf.c
-	%D%/$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfprintf.c -o $@
-
-$(lpfx)svfprintf.o: vfprintf.c
-	%D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfprintf.c -o $@
-
-$(lpfx)svfiprintf.o: vfprintf.c
-	%D%/$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfprintf.c -o $@
-
-$(lpfx)vfiwprintf.o: vfwprintf.c
-	%D%/$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfwprintf.c -o $@
-
-$(lpfx)svfwprintf.o: vfwprintf.c
-	%D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfwprintf.c -o $@
-
-$(lpfx)svfiwprintf.o: vfwprintf.c
-	%D%/$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfwprintf.c -o $@
-
-if NEWLIB_NANO_FORMATTED_IO
-# Rules compiling small-footprint nano-formatted-io implementation.
-$(lpfx)nano-vfscanf.o: nano-vfscanf.c
-	%D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfscanf.c -o $@
-
-$(lpfx)nano-vfscanf_i.o: nano-vfscanf_i.c
-	%D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfscanf_i.c -o $@
-
-$(lpfx)nano-vfscanf_float.o: nano-vfscanf_float.c
-	%D%/$(LIB_COMPILE) -c $(srcdir)/nano-vfscanf_float.c -o $@
-
-$(lpfx)nano-svfscanf.o: nano-vfscanf.c
-	%D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/nano-vfscanf.c -o $@
-endif
-
-$(lpfx)vfscanf.o: vfscanf.c
-	%D%/$(LIB_COMPILE) -c $(srcdir)/vfscanf.c -o $@
-
-$(lpfx)vfiscanf.o: vfscanf.c
-	%D%/$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfscanf.c -o $@
-
-$(lpfx)svfscanf.o: vfscanf.c
-	%D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfscanf.c -o $@
-
-$(lpfx)svfiscanf.o: vfscanf.c
-	%D%/$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfscanf.c -o $@
-
-$(lpfx)vfwscanf.o: vfwscanf.c
-	%D%/$(LIB_COMPILE) -c $(srcdir)/vfwscanf.c -o $@
-
-$(lpfx)vfiwscanf.o: vfwscanf.c
-	%D%/$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfwscanf.c -o $@
-
-$(lpfx)svfwscanf.o: vfwscanf.c
-	%D%/$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfwscanf.c -o $@
-
-$(lpfx)svfiwscanf.o: vfwscanf.c
-	%D%/$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfwscanf.c -o $@
-
-$(lpfx)clearerr.o: local.h
-$(lpfx)clearerr_u.o: local.h
-$(lpfx)fclose.o: local.h
-$(lpfx)fdopen.o: local.h
-$(lpfx)feof.o: local.h
-$(lpfx)feof_u.o: local.h
-$(lpfx)ferror.o: local.h
-$(lpfx)ferror_u.o: local.h
-$(lpfx)fflush.o: local.h
-$(lpfx)fflush_u.o: fflush.c
-$(lpfx)fgetc.o: local.h
-$(lpfx)fgetc_u.o: local.h
-$(lpfx)fgets.o: local.h
-$(lpfx)fgets_u.o: fgets.c
-$(lpfx)fgetwc.o: local.h
-$(lpfx)fgetwc_u.o: local.h
-$(lpfx)fgetws.o: local.h
-$(lpfx)fgetws_u.o: fgetws.c
-$(lpfx)fileno.o: local.h
-$(lpfx)fileno_u.o: local.h
-$(lpfx)findfp.o: local.h
-$(lpfx)fmemopen.o: local.h
-$(lpfx)fopen.o: local.h
-$(lpfx)fopencookie.o: local.h
-$(lpfx)fpurge.o: local.h
-$(lpfx)fputc.o: local.h
-$(lpfx)fputc_u.o: local.h
-$(lpfx)fputs.o: fvwrite.h
-$(lpfx)fputs_u.o: fputs.c
-$(lpfx)fputwc.o: local.h
-$(lpfx)fputwc_u.o: local.h
-$(lpfx)fputws.o: local.h fvwrite.h
-$(lpfx)fputws_u.o: fputws.c
-$(lpfx)fread.o: local.h
-$(lpfx)fread_u.o: fread.c
-$(lpfx)freopen.o: local.h
-$(lpfx)fseek.o: local.h
-$(lpfx)fsetlocking.o: local.h
-$(lpfx)ftell.o: local.h
-$(lpfx)funopen.o: local.h
-$(lpfx)fvwrite.o: local.h fvwrite.h
-$(lpfx)fwalk.o: local.h
-$(lpfx)fwide.o: local.h
-$(lpfx)fwprintf.o: local.h
-$(lpfx)fwrite.o: local.h fvwrite.h
-$(lpfx)fwrite_u.o: fwrite.c
-$(lpfx)fwscanf.o: local.h
-$(lpfx)getwc.o: local.h
-$(lpfx)getwc_u.o: local.h
-$(lpfx)getwchar.o: local.h
-$(lpfx)getwchar_u.o: local.h
-$(lpfx)iscanf.o: local.h
-$(lpfx)makebuf.o: local.h
-$(lpfx)open_memstream.o: local.h
-$(lpfx)puts.o: fvwrite.h
-$(lpfx)putwc.o: local.h
-$(lpfx)putwc_u.o: local.h
-$(lpfx)putwchar.o: local.h
-$(lpfx)putwchar_u.o: local.h
-$(lpfx)refill.o: local.h
-$(lpfx)scanf.o: local.h
-$(lpfx)setbuf.o: local.h
-$(lpfx)setvbuf.o: local.h
-$(lpfx)siprintf.o: local.h
-$(lpfx)siscanf.o: local.h
-$(lpfx)sniprintf.o: local.h
-$(lpfx)sprintf.o: local.h
-$(lpfx)sscanf.o: local.h
-$(lpfx)stdio.o: local.h
-if NEWLIB_NANO_FORMATTED_IO
-$(lpfx)nano-svfprintf.o: local.h nano-vfprintf_local.h
-$(lpfx)nano-svfscanf.o: local.h nano-vfscanf_local.h
-endif
-$(lpfx)svfiprintf.o: local.h
-$(lpfx)svfiscanf.o: local.h floatio.h
-$(lpfx)svfprintf.o: local.h
-$(lpfx)svfscanf.o: local.h floatio.h
-$(lpfx)swprintf.o: local.h
-$(lpfx)swscanf.o: local.h
-$(lpfx)ungetc.o: local.h
-$(lpfx)ungetwc.o: local.h
-if NEWLIB_NANO_FORMATTED_IO
-$(lpfx)nano-vfprintf.o: local.h nano-vfprintf_local.h
-$(lpfx)nano-vfprintf_i.o: local.h nano-vfprintf_local.h
-$(lpfx)nano-vfprintf_float.o: local.h floatio.h nano-vfprintf_local.h
-$(lpfx)nano-vfscanf.o: local.h nano-vfscanf_local.h
-$(lpfx)nano-vfscanf_i.o: local.h nano-vfscanf_local.h
-$(lpfx)nano-vfscanf_float.o: local.h floatio.h nano-vfscanf_local.h
-endif
-$(lpfx)vfiprintf.o: local.h
-$(lpfx)vfiscanf.o: local.h floatio.h
-$(lpfx)vfprintf.o: local.h
-$(lpfx)vfscanf.o: local.h floatio.h
-$(lpfx)vfwprintf.o: local.h
-$(lpfx)vfwscanf.o: local.h
-$(lpfx)viscanf.o: local.h
-$(lpfx)vscanf.o: local.h
-$(lpfx)vsiscanf.o: local.h
-$(lpfx)vsniprintf.o: local.h
-$(lpfx)vsscanf.o: local.h
-$(lpfx)vswprintf.o: local.h
-$(lpfx)vswscanf.o: local.h
-$(lpfx)vwprintf.o: local.h
-$(lpfx)vwscanf.o: local.h
-$(lpfx)wbuf.o: local.h fvwrite.h
-$(lpfx)wprintf.o: local.h
-$(lpfx)wscanf.o: local.h
-$(lpfx)wsetup.o: local.h
diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in
index 0478dcd..a30892f 100644
--- a/newlib/libc/stdio/Makefile.in
+++ b/newlib/libc/stdio/Makefile.in
@@ -88,6 +88,25 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@NEWLIB_NANO_FORMATTED_IO_TRUE@am__append_1 = \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	nano-vfprintf_float.c \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	nano-svfprintf.c \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	nano-svfscanf.c \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	nano-vfprintf.c \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	nano-vfprintf_i.c \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	nano-vfscanf.c \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	nano-vfscanf_i.c \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	nano-vfscanf_float.c
+
+@NEWLIB_NANO_FORMATTED_IO_FALSE@am__append_2 = \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	svfiprintf.c \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	svfprintf.c \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	svfiscanf.c \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	svfscanf.c \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	vfiprintf.c \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	vfscanf.c \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	vfiscanf.c
+
 subdir = libc/stdio
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
@@ -133,7 +152,23 @@ lib_a_AR = $(AR) $(ARFLAGS)
 @NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-vsiprintf.$(OBJEXT) \
 @NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-vsiscanf.$(OBJEXT) \
 @NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-vsniprintf.$(OBJEXT)
-am__objects_2 = $(am__objects_1) lib_a-clearerr.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@am__objects_2 = lib_a-nano-vfprintf_float.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	lib_a-nano-svfprintf.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	lib_a-nano-svfscanf.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	lib_a-nano-vfprintf.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	lib_a-nano-vfprintf_i.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	lib_a-nano-vfscanf.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	lib_a-nano-vfscanf_i.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_TRUE@	lib_a-nano-vfscanf_float.$(OBJEXT)
+@NEWLIB_NANO_FORMATTED_IO_FALSE@am__objects_3 =  \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-svfiprintf.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-svfprintf.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-svfiscanf.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-svfscanf.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-vfiprintf.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-vfscanf.$(OBJEXT) \
+@NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-vfiscanf.$(OBJEXT)
+am__objects_4 = $(am__objects_1) lib_a-clearerr.$(OBJEXT) \
 	lib_a-fclose.$(OBJEXT) lib_a-fdopen.$(OBJEXT) \
 	lib_a-feof.$(OBJEXT) lib_a-ferror.$(OBJEXT) \
 	lib_a-fflush.$(OBJEXT) lib_a-fgetc.$(OBJEXT) \
@@ -166,10 +201,14 @@ am__objects_2 = $(am__objects_1) lib_a-clearerr.$(OBJEXT) \
 	lib_a-vprintf.$(OBJEXT) lib_a-vscanf.$(OBJEXT) \
 	lib_a-vsnprintf.$(OBJEXT) lib_a-vsprintf.$(OBJEXT) \
 	lib_a-vsscanf.$(OBJEXT) lib_a-wbuf.$(OBJEXT) \
-	lib_a-wsetup.$(OBJEXT)
-@ELIX_LEVEL_1_FALSE@@NEWLIB_NANO_FORMATTED_IO_FALSE@am__objects_3 = lib_a-asiprintf.$(OBJEXT) \
+	lib_a-wsetup.$(OBJEXT) $(am__objects_2) $(am__objects_3) \
+	lib_a-svfiwprintf.$(OBJEXT) lib_a-svfwprintf.$(OBJEXT) \
+	lib_a-vfiwprintf.$(OBJEXT) lib_a-svfiwscanf.$(OBJEXT) \
+	lib_a-svfwscanf.$(OBJEXT) lib_a-vfiwscanf.$(OBJEXT) \
+	lib_a-vfwscanf.$(OBJEXT)
+@ELIX_LEVEL_1_FALSE@@NEWLIB_NANO_FORMATTED_IO_FALSE@am__objects_5 = lib_a-asiprintf.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@@NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-vasiprintf.$(OBJEXT)
-@ELIX_LEVEL_1_FALSE@am__objects_4 = $(am__objects_3) \
+@ELIX_LEVEL_1_FALSE@am__objects_6 = $(am__objects_5) \
 @ELIX_LEVEL_1_FALSE@	lib_a-asprintf.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@	lib_a-fcloseall.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@	lib_a-fseeko.$(OBJEXT) \
@@ -178,10 +217,10 @@ am__objects_2 = $(am__objects_1) lib_a-clearerr.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@	lib_a-mktemp.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@	lib_a-putw.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@	lib_a-vasprintf.$(OBJEXT)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@NEWLIB_NANO_FORMATTED_IO_FALSE@am__objects_5 = lib_a-asniprintf.$(OBJEXT) \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@NEWLIB_NANO_FORMATTED_IO_FALSE@am__objects_7 = lib_a-asniprintf.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-diprintf.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@NEWLIB_NANO_FORMATTED_IO_FALSE@	lib_a-vasniprintf.$(OBJEXT)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@am__objects_6 = $(am__objects_5) \
+@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@am__objects_8 = $(am__objects_7) \
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	lib_a-asnprintf.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	lib_a-clearerr_u.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	lib_a-dprintf.$(OBJEXT) \
@@ -231,7 +270,7 @@ am__objects_2 = $(am__objects_1) lib_a-clearerr.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	lib_a-vwscanf.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	lib_a-wprintf.$(OBJEXT) \
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@	lib_a-wscanf.$(OBJEXT)
-am_lib_a_OBJECTS = $(am__objects_2) $(am__objects_4) $(am__objects_6)
+am_lib_a_OBJECTS = $(am__objects_4) $(am__objects_6) $(am__objects_8)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -437,75 +476,20 @@ AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS)
 @NEWLIB_NANO_FORMATTED_IO_FALSE@	vsniprintf.c
 
 @NEWLIB_NANO_FORMATTED_IO_TRUE@GENERAL_INT_FORMATTED_IO_SOURCES = 
-GENERAL_SOURCES = \
-	$(GENERAL_INT_FORMATTED_IO_SOURCES) \
-	clearerr.c			\
-	fclose.c			\
-	fdopen.c			\
-	feof.c				\
-	ferror.c			\
-	fflush.c			\
-	fgetc.c			\
-	fgetpos.c			\
-	fgets.c			\
-	fileno.c			\
-	findfp.c			\
-	flags.c			\
-	fopen.c			\
-	fprintf.c			\
-	fputc.c			\
-	fputs.c			\
-	fread.c			\
-	freopen.c			\
-	fscanf.c			\
-	fseek.c			\
-	fsetpos.c			\
-	ftell.c			\
-	fvwrite.c			\
-	fwalk.c			\
-	fwrite.c			\
-	getc.c				\
-	getchar.c			\
-	getc_u.c			\
-	getchar_u.c			\
-	getdelim.c			\
-	getline.c			\
-	gets.c				\
-	makebuf.c			\
-	perror.c			\
-	printf.c			\
-	putc.c				\
-	putchar.c			\
-	putc_u.c			\
-	putchar_u.c			\
-	puts.c				\
-	refill.c			\
-	remove.c			\
-	rename.c			\
-	rewind.c			\
-	rget.c				\
-	scanf.c			\
-	sccl.c				\
-	setbuf.c			\
-	setbuffer.c			\
-	setlinebuf.c			\
-	setvbuf.c			\
-	snprintf.c			\
-	sprintf.c			\
-	sscanf.c			\
-	stdio.c			\
-	tmpfile.c			\
-	tmpnam.c			\
-	ungetc.c			\
-	vdprintf.c			\
-	vprintf.c			\
-	vscanf.c			\
-	vsnprintf.c			\
-	vsprintf.c			\
-	vsscanf.c			\
-	wbuf.c				\
-	wsetup.c
-
+GENERAL_SOURCES = $(GENERAL_INT_FORMATTED_IO_SOURCES) clearerr.c \
+	fclose.c fdopen.c feof.c ferror.c fflush.c fgetc.c fgetpos.c \
+	fgets.c fileno.c findfp.c flags.c fopen.c fprintf.c fputc.c \
+	fputs.c fread.c freopen.c fscanf.c fseek.c fsetpos.c ftell.c \
+	fvwrite.c fwalk.c fwrite.c getc.c getchar.c getc_u.c \
+	getchar_u.c getdelim.c getline.c gets.c makebuf.c perror.c \
+	printf.c putc.c putchar.c putc_u.c putchar_u.c puts.c refill.c \
+	remove.c rename.c rewind.c rget.c scanf.c sccl.c setbuf.c \
+	setbuffer.c setlinebuf.c setvbuf.c snprintf.c sprintf.c \
+	sscanf.c stdio.c tmpfile.c tmpnam.c ungetc.c vdprintf.c \
+	vprintf.c vscanf.c vsnprintf.c vsprintf.c vsscanf.c wbuf.c \
+	wsetup.c $(am__append_1) $(am__append_2) svfiwprintf.c \
+	svfwprintf.c vfiwprintf.c svfiwscanf.c svfwscanf.c vfiwscanf.c \
+	vfwscanf.c
 @ELIX_LEVEL_1_FALSE@ELIX_2_SOURCES = \
 @ELIX_LEVEL_1_FALSE@	$(ELIX_2_INT_FORMATTED_IO_SOURCES) \
 @ELIX_LEVEL_1_FALSE@	asprintf.c		\
@@ -584,33 +568,6 @@ GENERAL_SOURCES = \
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@NEWLIB_NANO_FORMATTED_IO_FALSE@	vasniprintf.c
 
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@NEWLIB_NANO_FORMATTED_IO_TRUE@ELIX_4_INT_FORMATTED_IO_SOURCES = 
-@NEWLIB_NANO_FORMATTED_IO_FALSE@LIBADD_OBJS = \
-@NEWLIB_NANO_FORMATTED_IO_FALSE@	$(lpfx)svfiprintf.o $(lpfx)svfprintf.o \
-@NEWLIB_NANO_FORMATTED_IO_FALSE@	$(lpfx)svfiscanf.o $(lpfx)svfscanf.o \
-@NEWLIB_NANO_FORMATTED_IO_FALSE@	$(lpfx)vfiprintf.o \
-@NEWLIB_NANO_FORMATTED_IO_FALSE@	$(lpfx)vfscanf.o $(lpfx)vfiscanf.o \
-@NEWLIB_NANO_FORMATTED_IO_FALSE@	$(lpfx)svfiwprintf.o $(lpfx)svfwprintf.o \
-@NEWLIB_NANO_FORMATTED_IO_FALSE@	$(lpfx)vfiwprintf.o \
-@NEWLIB_NANO_FORMATTED_IO_FALSE@	$(lpfx)svfiwscanf.o $(lpfx)svfwscanf.o \
-@NEWLIB_NANO_FORMATTED_IO_FALSE@	$(lpfx)vfiwscanf.o $(lpfx)vfwscanf.o
-
-@NEWLIB_NANO_FORMATTED_IO_TRUE@LIBADD_OBJS = \
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)nano-vfprintf_float.o	\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)nano-svfprintf.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)nano-svfscanf.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)nano-vfprintf.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)nano-vfprintf_i.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)nano-vfscanf.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)nano-vfscanf_i.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)nano-vfscanf_float.o	\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)svfiwprintf.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)svfwprintf.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)vfiwprintf.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)svfiwscanf.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)svfwscanf.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)vfiwscanf.o		\
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(lpfx)vfwscanf.o
-
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_2_SOURCES) $(ELIX_4_SOURCES)
 lib_a_LIBADD = $(LIBADD_OBJS)
@@ -1157,6 +1114,138 @@ lib_a-wsetup.o: wsetup.c
 lib_a-wsetup.obj: wsetup.c
 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wsetup.obj `if test -f 'wsetup.c'; then $(CYGPATH_W) 'wsetup.c'; else $(CYGPATH_W) '$(srcdir)/wsetup.c'; fi`
 
+lib_a-nano-vfprintf_float.o: nano-vfprintf_float.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfprintf_float.o `test -f 'nano-vfprintf_float.c' || echo '$(srcdir)/'`nano-vfprintf_float.c
+
+lib_a-nano-vfprintf_float.obj: nano-vfprintf_float.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfprintf_float.obj `if test -f 'nano-vfprintf_float.c'; then $(CYGPATH_W) 'nano-vfprintf_float.c'; else $(CYGPATH_W) '$(srcdir)/nano-vfprintf_float.c'; fi`
+
+lib_a-nano-svfprintf.o: nano-svfprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-svfprintf.o `test -f 'nano-svfprintf.c' || echo '$(srcdir)/'`nano-svfprintf.c
+
+lib_a-nano-svfprintf.obj: nano-svfprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-svfprintf.obj `if test -f 'nano-svfprintf.c'; then $(CYGPATH_W) 'nano-svfprintf.c'; else $(CYGPATH_W) '$(srcdir)/nano-svfprintf.c'; fi`
+
+lib_a-nano-svfscanf.o: nano-svfscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-svfscanf.o `test -f 'nano-svfscanf.c' || echo '$(srcdir)/'`nano-svfscanf.c
+
+lib_a-nano-svfscanf.obj: nano-svfscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-svfscanf.obj `if test -f 'nano-svfscanf.c'; then $(CYGPATH_W) 'nano-svfscanf.c'; else $(CYGPATH_W) '$(srcdir)/nano-svfscanf.c'; fi`
+
+lib_a-nano-vfprintf.o: nano-vfprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfprintf.o `test -f 'nano-vfprintf.c' || echo '$(srcdir)/'`nano-vfprintf.c
+
+lib_a-nano-vfprintf.obj: nano-vfprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfprintf.obj `if test -f 'nano-vfprintf.c'; then $(CYGPATH_W) 'nano-vfprintf.c'; else $(CYGPATH_W) '$(srcdir)/nano-vfprintf.c'; fi`
+
+lib_a-nano-vfprintf_i.o: nano-vfprintf_i.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfprintf_i.o `test -f 'nano-vfprintf_i.c' || echo '$(srcdir)/'`nano-vfprintf_i.c
+
+lib_a-nano-vfprintf_i.obj: nano-vfprintf_i.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfprintf_i.obj `if test -f 'nano-vfprintf_i.c'; then $(CYGPATH_W) 'nano-vfprintf_i.c'; else $(CYGPATH_W) '$(srcdir)/nano-vfprintf_i.c'; fi`
+
+lib_a-nano-vfscanf.o: nano-vfscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfscanf.o `test -f 'nano-vfscanf.c' || echo '$(srcdir)/'`nano-vfscanf.c
+
+lib_a-nano-vfscanf.obj: nano-vfscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfscanf.obj `if test -f 'nano-vfscanf.c'; then $(CYGPATH_W) 'nano-vfscanf.c'; else $(CYGPATH_W) '$(srcdir)/nano-vfscanf.c'; fi`
+
+lib_a-nano-vfscanf_i.o: nano-vfscanf_i.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfscanf_i.o `test -f 'nano-vfscanf_i.c' || echo '$(srcdir)/'`nano-vfscanf_i.c
+
+lib_a-nano-vfscanf_i.obj: nano-vfscanf_i.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfscanf_i.obj `if test -f 'nano-vfscanf_i.c'; then $(CYGPATH_W) 'nano-vfscanf_i.c'; else $(CYGPATH_W) '$(srcdir)/nano-vfscanf_i.c'; fi`
+
+lib_a-nano-vfscanf_float.o: nano-vfscanf_float.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfscanf_float.o `test -f 'nano-vfscanf_float.c' || echo '$(srcdir)/'`nano-vfscanf_float.c
+
+lib_a-nano-vfscanf_float.obj: nano-vfscanf_float.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-nano-vfscanf_float.obj `if test -f 'nano-vfscanf_float.c'; then $(CYGPATH_W) 'nano-vfscanf_float.c'; else $(CYGPATH_W) '$(srcdir)/nano-vfscanf_float.c'; fi`
+
+lib_a-svfiprintf.o: svfiprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfiprintf.o `test -f 'svfiprintf.c' || echo '$(srcdir)/'`svfiprintf.c
+
+lib_a-svfiprintf.obj: svfiprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfiprintf.obj `if test -f 'svfiprintf.c'; then $(CYGPATH_W) 'svfiprintf.c'; else $(CYGPATH_W) '$(srcdir)/svfiprintf.c'; fi`
+
+lib_a-svfprintf.o: svfprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfprintf.o `test -f 'svfprintf.c' || echo '$(srcdir)/'`svfprintf.c
+
+lib_a-svfprintf.obj: svfprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfprintf.obj `if test -f 'svfprintf.c'; then $(CYGPATH_W) 'svfprintf.c'; else $(CYGPATH_W) '$(srcdir)/svfprintf.c'; fi`
+
+lib_a-svfiscanf.o: svfiscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfiscanf.o `test -f 'svfiscanf.c' || echo '$(srcdir)/'`svfiscanf.c
+
+lib_a-svfiscanf.obj: svfiscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfiscanf.obj `if test -f 'svfiscanf.c'; then $(CYGPATH_W) 'svfiscanf.c'; else $(CYGPATH_W) '$(srcdir)/svfiscanf.c'; fi`
+
+lib_a-svfscanf.o: svfscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfscanf.o `test -f 'svfscanf.c' || echo '$(srcdir)/'`svfscanf.c
+
+lib_a-svfscanf.obj: svfscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfscanf.obj `if test -f 'svfscanf.c'; then $(CYGPATH_W) 'svfscanf.c'; else $(CYGPATH_W) '$(srcdir)/svfscanf.c'; fi`
+
+lib_a-vfiprintf.o: vfiprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfiprintf.o `test -f 'vfiprintf.c' || echo '$(srcdir)/'`vfiprintf.c
+
+lib_a-vfiprintf.obj: vfiprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfiprintf.obj `if test -f 'vfiprintf.c'; then $(CYGPATH_W) 'vfiprintf.c'; else $(CYGPATH_W) '$(srcdir)/vfiprintf.c'; fi`
+
+lib_a-vfscanf.o: vfscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfscanf.o `test -f 'vfscanf.c' || echo '$(srcdir)/'`vfscanf.c
+
+lib_a-vfscanf.obj: vfscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfscanf.obj `if test -f 'vfscanf.c'; then $(CYGPATH_W) 'vfscanf.c'; else $(CYGPATH_W) '$(srcdir)/vfscanf.c'; fi`
+
+lib_a-vfiscanf.o: vfiscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfiscanf.o `test -f 'vfiscanf.c' || echo '$(srcdir)/'`vfiscanf.c
+
+lib_a-vfiscanf.obj: vfiscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfiscanf.obj `if test -f 'vfiscanf.c'; then $(CYGPATH_W) 'vfiscanf.c'; else $(CYGPATH_W) '$(srcdir)/vfiscanf.c'; fi`
+
+lib_a-svfiwprintf.o: svfiwprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfiwprintf.o `test -f 'svfiwprintf.c' || echo '$(srcdir)/'`svfiwprintf.c
+
+lib_a-svfiwprintf.obj: svfiwprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfiwprintf.obj `if test -f 'svfiwprintf.c'; then $(CYGPATH_W) 'svfiwprintf.c'; else $(CYGPATH_W) '$(srcdir)/svfiwprintf.c'; fi`
+
+lib_a-svfwprintf.o: svfwprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfwprintf.o `test -f 'svfwprintf.c' || echo '$(srcdir)/'`svfwprintf.c
+
+lib_a-svfwprintf.obj: svfwprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfwprintf.obj `if test -f 'svfwprintf.c'; then $(CYGPATH_W) 'svfwprintf.c'; else $(CYGPATH_W) '$(srcdir)/svfwprintf.c'; fi`
+
+lib_a-vfiwprintf.o: vfiwprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfiwprintf.o `test -f 'vfiwprintf.c' || echo '$(srcdir)/'`vfiwprintf.c
+
+lib_a-vfiwprintf.obj: vfiwprintf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfiwprintf.obj `if test -f 'vfiwprintf.c'; then $(CYGPATH_W) 'vfiwprintf.c'; else $(CYGPATH_W) '$(srcdir)/vfiwprintf.c'; fi`
+
+lib_a-svfiwscanf.o: svfiwscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfiwscanf.o `test -f 'svfiwscanf.c' || echo '$(srcdir)/'`svfiwscanf.c
+
+lib_a-svfiwscanf.obj: svfiwscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfiwscanf.obj `if test -f 'svfiwscanf.c'; then $(CYGPATH_W) 'svfiwscanf.c'; else $(CYGPATH_W) '$(srcdir)/svfiwscanf.c'; fi`
+
+lib_a-svfwscanf.o: svfwscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfwscanf.o `test -f 'svfwscanf.c' || echo '$(srcdir)/'`svfwscanf.c
+
+lib_a-svfwscanf.obj: svfwscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-svfwscanf.obj `if test -f 'svfwscanf.c'; then $(CYGPATH_W) 'svfwscanf.c'; else $(CYGPATH_W) '$(srcdir)/svfwscanf.c'; fi`
+
+lib_a-vfiwscanf.o: vfiwscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfiwscanf.o `test -f 'vfiwscanf.c' || echo '$(srcdir)/'`vfiwscanf.c
+
+lib_a-vfiwscanf.obj: vfiwscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfiwscanf.obj `if test -f 'vfiwscanf.c'; then $(CYGPATH_W) 'vfiwscanf.c'; else $(CYGPATH_W) '$(srcdir)/vfiwscanf.c'; fi`
+
+lib_a-vfwscanf.o: vfwscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfwscanf.o `test -f 'vfwscanf.c' || echo '$(srcdir)/'`vfwscanf.c
+
+lib_a-vfwscanf.obj: vfwscanf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-vfwscanf.obj `if test -f 'vfwscanf.c'; then $(CYGPATH_W) 'vfwscanf.c'; else $(CYGPATH_W) '$(srcdir)/vfwscanf.c'; fi`
+
 lib_a-asiprintf.o: asiprintf.c
 	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-asiprintf.o `test -f 'asiprintf.c' || echo '$(srcdir)/'`asiprintf.c
 
@@ -1699,189 +1788,6 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-# Though small footprint nano-formatted-IO implementation is used
-# when NEWLIB_NANO_FORMATTED_IO is enabled, we keep all rules for
-# the other implementation of formatted IO including all i-family
-# functions.  The object files in !NEWLIB_NANO_FORMATTED_IO version
-# implementation will be neither compiled nor archived into final
-# library, because they are not depended on by final makefile target.
-
-# Rules compiling small-footprint nano-formatted-io implementation.
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfprintf.o: nano-vfprintf.c
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(LIB_COMPILE) -c $(srcdir)/nano-vfprintf.c -o $@
-
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfprintf_i.o: nano-vfprintf_i.c
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(LIB_COMPILE) -c $(srcdir)/nano-vfprintf_i.c -o $@
-
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfprintf_float.o: nano-vfprintf_float.c
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(LIB_COMPILE) -c $(srcdir)/nano-vfprintf_float.c -o $@
-
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-svfprintf.o: nano-vfprintf.c
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/nano-vfprintf.c -o $@
-
-# This rule is needed so that libtool compiles vfiprintf before vfprintf.
-# Otherwise libtool moves vfprintf.o and subsequently can't find it.
-
-$(lpfx)vfiprintf.o: vfprintf.c
-	$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfprintf.c -o $@
-
-$(lpfx)svfprintf.o: vfprintf.c
-	$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfprintf.c -o $@
-
-$(lpfx)svfiprintf.o: vfprintf.c
-	$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfprintf.c -o $@
-
-$(lpfx)vfiwprintf.o: vfwprintf.c
-	$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfwprintf.c -o $@
-
-$(lpfx)svfwprintf.o: vfwprintf.c
-	$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfwprintf.c -o $@
-
-$(lpfx)svfiwprintf.o: vfwprintf.c
-	$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfwprintf.c -o $@
-
-# Rules compiling small-footprint nano-formatted-io implementation.
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfscanf.o: nano-vfscanf.c
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(LIB_COMPILE) -c $(srcdir)/nano-vfscanf.c -o $@
-
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfscanf_i.o: nano-vfscanf_i.c
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(LIB_COMPILE) -c $(srcdir)/nano-vfscanf_i.c -o $@
-
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfscanf_float.o: nano-vfscanf_float.c
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(LIB_COMPILE) -c $(srcdir)/nano-vfscanf_float.c -o $@
-
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-svfscanf.o: nano-vfscanf.c
-@NEWLIB_NANO_FORMATTED_IO_TRUE@	$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/nano-vfscanf.c -o $@
-
-$(lpfx)vfscanf.o: vfscanf.c
-	$(LIB_COMPILE) -c $(srcdir)/vfscanf.c -o $@
-
-$(lpfx)vfiscanf.o: vfscanf.c
-	$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfscanf.c -o $@
-
-$(lpfx)svfscanf.o: vfscanf.c
-	$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfscanf.c -o $@
-
-$(lpfx)svfiscanf.o: vfscanf.c
-	$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfscanf.c -o $@
-
-$(lpfx)vfwscanf.o: vfwscanf.c
-	$(LIB_COMPILE) -c $(srcdir)/vfwscanf.c -o $@
-
-$(lpfx)vfiwscanf.o: vfwscanf.c
-	$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfwscanf.c -o $@
-
-$(lpfx)svfwscanf.o: vfwscanf.c
-	$(LIB_COMPILE) -DSTRING_ONLY -c $(srcdir)/vfwscanf.c -o $@
-
-$(lpfx)svfiwscanf.o: vfwscanf.c
-	$(LIB_COMPILE) -DINTEGER_ONLY -DSTRING_ONLY -c $(srcdir)/vfwscanf.c -o $@
-
-$(lpfx)clearerr.o: local.h
-$(lpfx)clearerr_u.o: local.h
-$(lpfx)fclose.o: local.h
-$(lpfx)fdopen.o: local.h
-$(lpfx)feof.o: local.h
-$(lpfx)feof_u.o: local.h
-$(lpfx)ferror.o: local.h
-$(lpfx)ferror_u.o: local.h
-$(lpfx)fflush.o: local.h
-$(lpfx)fflush_u.o: fflush.c
-$(lpfx)fgetc.o: local.h
-$(lpfx)fgetc_u.o: local.h
-$(lpfx)fgets.o: local.h
-$(lpfx)fgets_u.o: fgets.c
-$(lpfx)fgetwc.o: local.h
-$(lpfx)fgetwc_u.o: local.h
-$(lpfx)fgetws.o: local.h
-$(lpfx)fgetws_u.o: fgetws.c
-$(lpfx)fileno.o: local.h
-$(lpfx)fileno_u.o: local.h
-$(lpfx)findfp.o: local.h
-$(lpfx)fmemopen.o: local.h
-$(lpfx)fopen.o: local.h
-$(lpfx)fopencookie.o: local.h
-$(lpfx)fpurge.o: local.h
-$(lpfx)fputc.o: local.h
-$(lpfx)fputc_u.o: local.h
-$(lpfx)fputs.o: fvwrite.h
-$(lpfx)fputs_u.o: fputs.c
-$(lpfx)fputwc.o: local.h
-$(lpfx)fputwc_u.o: local.h
-$(lpfx)fputws.o: local.h fvwrite.h
-$(lpfx)fputws_u.o: fputws.c
-$(lpfx)fread.o: local.h
-$(lpfx)fread_u.o: fread.c
-$(lpfx)freopen.o: local.h
-$(lpfx)fseek.o: local.h
-$(lpfx)fsetlocking.o: local.h
-$(lpfx)ftell.o: local.h
-$(lpfx)funopen.o: local.h
-$(lpfx)fvwrite.o: local.h fvwrite.h
-$(lpfx)fwalk.o: local.h
-$(lpfx)fwide.o: local.h
-$(lpfx)fwprintf.o: local.h
-$(lpfx)fwrite.o: local.h fvwrite.h
-$(lpfx)fwrite_u.o: fwrite.c
-$(lpfx)fwscanf.o: local.h
-$(lpfx)getwc.o: local.h
-$(lpfx)getwc_u.o: local.h
-$(lpfx)getwchar.o: local.h
-$(lpfx)getwchar_u.o: local.h
-$(lpfx)iscanf.o: local.h
-$(lpfx)makebuf.o: local.h
-$(lpfx)open_memstream.o: local.h
-$(lpfx)puts.o: fvwrite.h
-$(lpfx)putwc.o: local.h
-$(lpfx)putwc_u.o: local.h
-$(lpfx)putwchar.o: local.h
-$(lpfx)putwchar_u.o: local.h
-$(lpfx)refill.o: local.h
-$(lpfx)scanf.o: local.h
-$(lpfx)setbuf.o: local.h
-$(lpfx)setvbuf.o: local.h
-$(lpfx)siprintf.o: local.h
-$(lpfx)siscanf.o: local.h
-$(lpfx)sniprintf.o: local.h
-$(lpfx)sprintf.o: local.h
-$(lpfx)sscanf.o: local.h
-$(lpfx)stdio.o: local.h
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-svfprintf.o: local.h nano-vfprintf_local.h
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-svfscanf.o: local.h nano-vfscanf_local.h
-$(lpfx)svfiprintf.o: local.h
-$(lpfx)svfiscanf.o: local.h floatio.h
-$(lpfx)svfprintf.o: local.h
-$(lpfx)svfscanf.o: local.h floatio.h
-$(lpfx)swprintf.o: local.h
-$(lpfx)swscanf.o: local.h
-$(lpfx)ungetc.o: local.h
-$(lpfx)ungetwc.o: local.h
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfprintf.o: local.h nano-vfprintf_local.h
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfprintf_i.o: local.h nano-vfprintf_local.h
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfprintf_float.o: local.h floatio.h nano-vfprintf_local.h
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfscanf.o: local.h nano-vfscanf_local.h
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfscanf_i.o: local.h nano-vfscanf_local.h
-@NEWLIB_NANO_FORMATTED_IO_TRUE@$(lpfx)nano-vfscanf_float.o: local.h floatio.h nano-vfscanf_local.h
-$(lpfx)vfiprintf.o: local.h
-$(lpfx)vfiscanf.o: local.h floatio.h
-$(lpfx)vfprintf.o: local.h
-$(lpfx)vfscanf.o: local.h floatio.h
-$(lpfx)vfwprintf.o: local.h
-$(lpfx)vfwscanf.o: local.h
-$(lpfx)viscanf.o: local.h
-$(lpfx)vscanf.o: local.h
-$(lpfx)vsiscanf.o: local.h
-$(lpfx)vsniprintf.o: local.h
-$(lpfx)vsscanf.o: local.h
-$(lpfx)vswprintf.o: local.h
-$(lpfx)vswscanf.o: local.h
-$(lpfx)vwprintf.o: local.h
-$(lpfx)vwscanf.o: local.h
-$(lpfx)wbuf.o: local.h fvwrite.h
-$(lpfx)wprintf.o: local.h
-$(lpfx)wscanf.o: local.h
-$(lpfx)wsetup.o: local.h
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/newlib/libc/stdio/nano-svfprintf.c b/newlib/libc/stdio/nano-svfprintf.c
new file mode 100644
index 0000000..6d2daef
--- /dev/null
+++ b/newlib/libc/stdio/nano-svfprintf.c
@@ -0,0 +1,2 @@
+#define STRING_ONLY
+#include "nano-vfprintf.c"
diff --git a/newlib/libc/stdio/nano-svfscanf.c b/newlib/libc/stdio/nano-svfscanf.c
new file mode 100644
index 0000000..8fe4d9b
--- /dev/null
+++ b/newlib/libc/stdio/nano-svfscanf.c
@@ -0,0 +1,2 @@
+#define STRING_ONLY
+#include "nano-vfscanf.c"
diff --git a/newlib/libc/stdio/svfiprintf.c b/newlib/libc/stdio/svfiprintf.c
new file mode 100644
index 0000000..bbcc81c
--- /dev/null
+++ b/newlib/libc/stdio/svfiprintf.c
@@ -0,0 +1,3 @@
+#define INTEGER_ONLY
+#define STRING_ONLY
+#include "vfprintf.c"
diff --git a/newlib/libc/stdio/svfiscanf.c b/newlib/libc/stdio/svfiscanf.c
new file mode 100644
index 0000000..e79cc79
--- /dev/null
+++ b/newlib/libc/stdio/svfiscanf.c
@@ -0,0 +1,3 @@
+#define INTEGER_ONLY
+#define STRING_ONLY
+#include "vfscanf.c"
diff --git a/newlib/libc/stdio/svfiwprintf.c b/newlib/libc/stdio/svfiwprintf.c
new file mode 100644
index 0000000..a9df2ca
--- /dev/null
+++ b/newlib/libc/stdio/svfiwprintf.c
@@ -0,0 +1,3 @@
+#define INTEGER_ONLY
+#define STRING_ONLY
+#include "vfwprintf.c"
diff --git a/newlib/libc/stdio/svfiwscanf.c b/newlib/libc/stdio/svfiwscanf.c
new file mode 100644
index 0000000..7e6a36f
--- /dev/null
+++ b/newlib/libc/stdio/svfiwscanf.c
@@ -0,0 +1,3 @@
+#define INTEGER_ONLY
+#define STRING_ONLY
+#include "vfwscanf.c"
diff --git a/newlib/libc/stdio/svfprintf.c b/newlib/libc/stdio/svfprintf.c
new file mode 100644
index 0000000..fe053c2
--- /dev/null
+++ b/newlib/libc/stdio/svfprintf.c
@@ -0,0 +1,2 @@
+#define STRING_ONLY
+#include "vfprintf.c"
diff --git a/newlib/libc/stdio/svfscanf.c b/newlib/libc/stdio/svfscanf.c
new file mode 100644
index 0000000..ed01020
--- /dev/null
+++ b/newlib/libc/stdio/svfscanf.c
@@ -0,0 +1,2 @@
+#define STRING_ONLY
+#include "vfscanf.c"
diff --git a/newlib/libc/stdio/svfwprintf.c b/newlib/libc/stdio/svfwprintf.c
new file mode 100644
index 0000000..1ee9dd5
--- /dev/null
+++ b/newlib/libc/stdio/svfwprintf.c
@@ -0,0 +1,2 @@
+#define STRING_ONLY
+#include "vfwprintf.c"
diff --git a/newlib/libc/stdio/svfwscanf.c b/newlib/libc/stdio/svfwscanf.c
new file mode 100644
index 0000000..3b2987d
--- /dev/null
+++ b/newlib/libc/stdio/svfwscanf.c
@@ -0,0 +1,2 @@
+#define STRING_ONLY
+#include "vfwscanf.c"
diff --git a/newlib/libc/stdio/vfiprintf.c b/newlib/libc/stdio/vfiprintf.c
new file mode 100644
index 0000000..83394a6
--- /dev/null
+++ b/newlib/libc/stdio/vfiprintf.c
@@ -0,0 +1,2 @@
+#define INTEGER_ONLY
+#include "vfprintf.c"
diff --git a/newlib/libc/stdio/vfiscanf.c b/newlib/libc/stdio/vfiscanf.c
new file mode 100644
index 0000000..261122e
--- /dev/null
+++ b/newlib/libc/stdio/vfiscanf.c
@@ -0,0 +1,2 @@
+#define INTEGER_ONLY
+#include "vfscanf.c"
diff --git a/newlib/libc/stdio/vfiwprintf.c b/newlib/libc/stdio/vfiwprintf.c
new file mode 100644
index 0000000..32546b5
--- /dev/null
+++ b/newlib/libc/stdio/vfiwprintf.c
@@ -0,0 +1,2 @@
+#define INTEGER_ONLY
+#include "vfwprintf.c"
diff --git a/newlib/libc/stdio/vfiwscanf.c b/newlib/libc/stdio/vfiwscanf.c
new file mode 100644
index 0000000..8b96cd3
--- /dev/null
+++ b/newlib/libc/stdio/vfiwscanf.c
@@ -0,0 +1,2 @@
+#define INTEGER_ONLY
+#include "vfwscanf.c"