2006-05-01 Jeff Johnston <jjohnstn@redhat.com>

        * libc/argz/Makefile.am: Prefix any objects specified with $(lpfx).  If source file can
        be specified instead of object, do so.
        * libc/ctype/Makefile.am: Ditto.
        * libc/iconv/ccs/Makefile.am: Ditto.
        * libc/iconv/ces/Makefile.am: Ditto.
        * libc/iconv/lib/Makefile.am: Ditto.
        * libc/locale/Makefile.am: Ditto.
        * libc/posix/Makefile.am: Ditto.
        * libc/reent/Makefile.am: Ditto.
        * libc/search/Makefile.am: Ditto.
        * libc/stdio/Makefile.am: Ditto.
        * libc/stdio64/Makefile.am: Ditto.
        * libc/stdlib/Makefile.am: Ditto.
        * libc/string/Makefile.am: Ditto.
        * libc/syscalls/Makefile.am: Ditto.
        * libc/unix/Makefile.am: Ditto.
        * libc/machine/a29k/Makefile.am: Specify lib_a_CCASFLAGS so .S files will get
        prefix added automatically.  Any specified rules must use $(lpfx) for
        object file names.
        * libc/machine/arm/Makefile.am: Ditto.
        * libc/machine/cris/Makefile.am: Ditto.
        * libc/machine/crx/Makefile.am: Ditto.
        * libc/machine/d10v/Makefile.am: Ditto.
        * libc/machine/d30v/Makefile.am: Ditto.
        * libc/machine/fr30/Makefile.am: Ditto.
        * libc/machine/frv/Makefile.am: Ditto.
        * libc/machine/h8300/Makefile.am: Ditto.
        * libc/machine/h8500/Makefile.am: Ditto.
        * libc/machine/hppa/Makefile.am: Ditto.
        * libc/machine/i386/Makefile.am: Ditto.
        * libc/machine/i960/Makefile.am: Ditto.
        * libc/machine/iq2000/Makefile.am: Ditto.
        * libc/machine/m32c/Makefile.am: Ditto.
        * libc/machine/m32r/Makefile.am: Ditto.
        * libc/machine/m68hc11/Makefile.am: Ditto.
        * libc/machine/m68k/Makefile.am: Ditto.
        * libc/machine/m88k/Makefile.am: Ditto.
        * libc/machine/mips/Makefile.am: Ditto.
        * libc/machine/mn10200/Makefile.am: Ditto.
        * libc/machine/mn10300/Makefile.am: Ditto.
        * libc/machine/mt/Makefile.am: Ditto.
        * libc/machine/necv70/Makefile.am: Ditto.
        * libc/machine/powerpc/Makefile.am: Ditto.
        * libc/machine/sh/Makefile.am: Ditto.
        * libc/machine/sh/Makefile.in: Ditto.
        * libc/machine/sparc/Makefile.am: Ditto.
        * libc/machine/tic4x/Makefile.am: Ditto.
        * libc/machine/tic80/Makefile.am: Ditto.
        * libc/machine/v850/Makefile.am: Ditto.
        * libc/machine/w65/Makefile.am: Ditto.
        * libc/machine/xscale/Makefile.am: Ditto.
        * libc/machine/xstormy16/Makefile.am: Ditto.
        * libc/machine/z8k/Makefile.am: Ditto.
        * libc/sys/a29khif/Makefile.am: Ditto.
        * libc/sys/arm/Makefile.am: Ditto.
        * libc/sys/d10v/Makefile.am: Ditto.
        * libc/sys/h8300hms/Makefile.am: Ditto.
        * libc/sys/h8500hms/Makefile.am: Ditto.
        * libc/sys/linux/Makefile.am: Ditto.
        * libc/sys/linux/linuxthreads/Makefile.am: Ditto.
        * libc/sys/linux/net/Makefile.am: Ditto.
        * libc/sys/linux/stdlib/Makefile.am: Ditto.
        * libc/sys/m88kbug/Makefile.am: Ditto.
        * libc/sys/mmixware/Makefile.am: Ditto.
        * libc/sys/rdos/Makefile.am: Ditto.
        * libc/sys/rtems/Makefile.am: Ditto.
        * libc/sys/sh/Makefile.am: Ditto.
        * libc/sys/sun4/Makefile.am: Ditto.
        * libc/sys/sysmec/Makefile.am: Ditto.
        * libc/sys/sysnec810/Makefile.am: Ditto.
        * libc/sys/sysnecv850/Makefile.am: Ditto.
        * libc/sys/sysvi386/Makefile.am: Ditto.
        * libc/sys/sysvnecv70/Makefile.am: Ditto.
        * libc/sys/tic80/Makefile.am: Ditto.
        * libc/sys/w65/Makefile.am: Ditto.
        * libc/sys/z8ksim/Makefile.am: Ditto.
        * libc/machine/necv70/fastmath.S: Renamed from .s file.
        * libc/machine/necv70/setjmp.S: Ditto.
        * libc/machine/necv70/fastmath.s: Removed.
        * libc/machine/necv70/setjmp.s: Ditto.
        * libc/machine/w65/*.S: New files renamed from .s files.
        * libc/machine/w65/*.s: Renamed and removed.
        * libc/sys/a29khif/*.S: New files renamed from .s files.
        * libc/sys/a29khif/*.s: Renamed and removed.
        * libc/sys/sysvi386/*.S: New files renamed from .s files.
        * libc/sys/sysvi386/*.s: Renamed and removed.
        * libc/sys/sysvnecv70/*.S: New files renamed from .s files.
        * libc/sys/sysvnecv70/*.s: Renamed and removed.
        * libc/*Makefile.in: Regenerated as appropriate.

2 files changed, 92 insertions, 102 deletions

diff --git a/newlib/libc/ctype/Makefile.am b/newlib/libc/ctype/Makefile.am
index 72fc8656d..e442cf2f5 100644
--- a/newlib/libc/ctype/Makefile.am
+++ b/newlib/libc/ctype/Makefile.am
@@ -4,66 +4,62 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES = \
-	ctype_.c \
-	isalnum.c \
-	isalpha.c \
-	iscntrl.c \
-	isdigit.c \
-	islower.c \
-	isupper.c \
-	isprint.c \
-	ispunct.c \
-	isspace.c \
-	isxdigit.c \
-	tolower.c \
+GENERAL_SOURCES = 	\
+	ctype_.c 	\
+	isalnum.c 	\
+	isalpha.c 	\
+	iscntrl.c 	\
+	isdigit.c 	\
+	islower.c 	\
+	isupper.c 	\
+	isprint.c 	\
+	ispunct.c 	\
+	isspace.c 	\
+	isxdigit.c 	\
+	tolower.c 	\
 	toupper.c
 
 ## The following handles EL/IX level 2 functions
 if ELIX_LEVEL_1
-LIB_OBJS =
+ELIX_SOURCES =
 else
-LIB_OBJS = \
-	isascii.$(oext) \
-	isblank.$(oext) \
-	iswalnum.$(oext) \
-	iswalpha.$(oext) \
-	iswblank.$(oext) \
-	iswcntrl.$(oext) \
-	iswctype.$(oext) \
-	iswdigit.$(oext) \
-	iswgraph.$(oext) \
-	iswlower.$(oext) \
-	iswprint.$(oext) \
-	iswpunct.$(oext) \
-	iswspace.$(oext) \
-	iswupper.$(oext) \
-	iswxdigit.$(oext) \
-	jp2uc.$(oext) \
-	toascii.$(oext) \
-	_tolower.$(oext) \
-	_toupper.$(oext) \
-	towctrans.$(oext) \
-	towlower.$(oext) \
-	towupper.$(oext) \
-	wctrans.$(oext)	\
-	wctype.$(oext)
+ELIX_SOURCES = \
+	isascii.c 	\
+	isblank.c 	\
+	iswalnum.c 	\
+	iswalpha.c 	\
+	iswblank.c 	\
+	iswcntrl.c 	\
+	iswctype.c 	\
+	iswdigit.c 	\
+	iswgraph.c 	\
+	iswlower.c 	\
+	iswprint.c 	\
+	iswpunct.c 	\
+	iswspace.c 	\
+	iswupper.c 	\
+	iswxdigit.c 	\
+	jp2uc.c 	\
+	toascii.c 	\
+	_tolower.c 	\
+	_toupper.c 	\
+	towctrans.c 	\
+	towlower.c 	\
+	towupper.c 	\
+	wctrans.c 	\
+	wctype.c
 endif
 
 libctype_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libctype.la
-libctype_la_SOURCES = $(GENERAL_SOURCES)
-libctype_la_LIBADD = $(LIB_OBJS)
-libctype_la_DEPENDENCIES = $(LIB_OBJS)
+libctype_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
 lib_a_CFLAGS = $(AM_CFLAGS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
 noinst_DATA =
 endif # USE_LIBTOOL
 
diff --git a/newlib/libc/ctype/Makefile.in b/newlib/libc/ctype/Makefile.in
index 6640290c8..35a39474b 100644
--- a/newlib/libc/ctype/Makefile.in
+++ b/newlib/libc/ctype/Makefile.in
@@ -53,19 +53,7 @@ CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 lib_a_AR = $(AR) $(ARFLAGS)
-@ELIX_LEVEL_1_FALSE@am__DEPENDENCIES_1 = isascii.$(oext) \
-@ELIX_LEVEL_1_FALSE@	isblank.$(oext) iswalnum.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswalpha.$(oext) iswblank.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswcntrl.$(oext) iswctype.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswdigit.$(oext) iswgraph.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswlower.$(oext) iswprint.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswpunct.$(oext) iswspace.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswupper.$(oext) iswxdigit.$(oext) \
-@ELIX_LEVEL_1_FALSE@	jp2uc.$(oext) toascii.$(oext) \
-@ELIX_LEVEL_1_FALSE@	_tolower.$(oext) _toupper.$(oext) \
-@ELIX_LEVEL_1_FALSE@	towctrans.$(oext) towlower.$(oext) \
-@ELIX_LEVEL_1_FALSE@	towupper.$(oext) wctrans.$(oext) \
-@ELIX_LEVEL_1_FALSE@	wctype.$(oext)
+lib_a_LIBADD =
 am__objects_1 = lib_a-ctype_.$(OBJEXT) lib_a-isalnum.$(OBJEXT) \
 	lib_a-isalpha.$(OBJEXT) lib_a-iscntrl.$(OBJEXT) \
 	lib_a-isdigit.$(OBJEXT) lib_a-islower.$(OBJEXT) \
@@ -76,10 +64,20 @@ am__objects_1 = lib_a-ctype_.$(OBJEXT) lib_a-isalnum.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@am_lib_a_OBJECTS = $(am__objects_1)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 LTLIBRARIES = $(noinst_LTLIBRARIES)
+libctype_la_LIBADD =
 am__objects_2 = ctype_.lo isalnum.lo isalpha.lo iscntrl.lo isdigit.lo \
 	islower.lo isupper.lo isprint.lo ispunct.lo isspace.lo \
 	isxdigit.lo tolower.lo toupper.lo
-@USE_LIBTOOL_TRUE@am_libctype_la_OBJECTS = $(am__objects_2)
+@ELIX_LEVEL_1_FALSE@am__objects_3 = isascii.lo isblank.lo iswalnum.lo \
+@ELIX_LEVEL_1_FALSE@	iswalpha.lo iswblank.lo iswcntrl.lo \
+@ELIX_LEVEL_1_FALSE@	iswctype.lo iswdigit.lo iswgraph.lo \
+@ELIX_LEVEL_1_FALSE@	iswlower.lo iswprint.lo iswpunct.lo \
+@ELIX_LEVEL_1_FALSE@	iswspace.lo iswupper.lo iswxdigit.lo \
+@ELIX_LEVEL_1_FALSE@	jp2uc.lo toascii.lo _tolower.lo \
+@ELIX_LEVEL_1_FALSE@	_toupper.lo towctrans.lo towlower.lo \
+@ELIX_LEVEL_1_FALSE@	towupper.lo wctrans.lo wctype.lo
+@USE_LIBTOOL_TRUE@am_libctype_la_OBJECTS = $(am__objects_2) \
+@USE_LIBTOOL_TRUE@	$(am__objects_3)
 libctype_la_OBJECTS = $(am_libctype_la_OBJECTS)
 @USE_LIBTOOL_TRUE@am_libctype_la_rpath =
 DEFAULT_INCLUDES = -I. -I$(srcdir)
@@ -238,59 +236,55 @@ target_alias = @target_alias@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 GENERAL_SOURCES = \
-	ctype_.c \
-	isalnum.c \
-	isalpha.c \
-	iscntrl.c \
-	isdigit.c \
-	islower.c \
-	isupper.c \
-	isprint.c \
-	ispunct.c \
-	isspace.c \
-	isxdigit.c \
-	tolower.c \
+	ctype_.c 	\
+	isalnum.c 	\
+	isalpha.c 	\
+	iscntrl.c 	\
+	isdigit.c 	\
+	islower.c 	\
+	isupper.c 	\
+	isprint.c 	\
+	ispunct.c 	\
+	isspace.c 	\
+	isxdigit.c 	\
+	tolower.c 	\
 	toupper.c
 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = \
-@ELIX_LEVEL_1_FALSE@	isascii.$(oext) \
-@ELIX_LEVEL_1_FALSE@	isblank.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswalnum.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswalpha.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswblank.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswcntrl.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswctype.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswdigit.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswgraph.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswlower.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswprint.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswpunct.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswspace.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswupper.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iswxdigit.$(oext) \
-@ELIX_LEVEL_1_FALSE@	jp2uc.$(oext) \
-@ELIX_LEVEL_1_FALSE@	toascii.$(oext) \
-@ELIX_LEVEL_1_FALSE@	_tolower.$(oext) \
-@ELIX_LEVEL_1_FALSE@	_toupper.$(oext) \
-@ELIX_LEVEL_1_FALSE@	towctrans.$(oext) \
-@ELIX_LEVEL_1_FALSE@	towlower.$(oext) \
-@ELIX_LEVEL_1_FALSE@	towupper.$(oext) \
-@ELIX_LEVEL_1_FALSE@	wctrans.$(oext)	\
-@ELIX_LEVEL_1_FALSE@	wctype.$(oext)
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
+@ELIX_LEVEL_1_FALSE@ELIX_SOURCES = \
+@ELIX_LEVEL_1_FALSE@	isascii.c 	\
+@ELIX_LEVEL_1_FALSE@	isblank.c 	\
+@ELIX_LEVEL_1_FALSE@	iswalnum.c 	\
+@ELIX_LEVEL_1_FALSE@	iswalpha.c 	\
+@ELIX_LEVEL_1_FALSE@	iswblank.c 	\
+@ELIX_LEVEL_1_FALSE@	iswcntrl.c 	\
+@ELIX_LEVEL_1_FALSE@	iswctype.c 	\
+@ELIX_LEVEL_1_FALSE@	iswdigit.c 	\
+@ELIX_LEVEL_1_FALSE@	iswgraph.c 	\
+@ELIX_LEVEL_1_FALSE@	iswlower.c 	\
+@ELIX_LEVEL_1_FALSE@	iswprint.c 	\
+@ELIX_LEVEL_1_FALSE@	iswpunct.c 	\
+@ELIX_LEVEL_1_FALSE@	iswspace.c 	\
+@ELIX_LEVEL_1_FALSE@	iswupper.c 	\
+@ELIX_LEVEL_1_FALSE@	iswxdigit.c 	\
+@ELIX_LEVEL_1_FALSE@	jp2uc.c 	\
+@ELIX_LEVEL_1_FALSE@	toascii.c 	\
+@ELIX_LEVEL_1_FALSE@	_tolower.c 	\
+@ELIX_LEVEL_1_FALSE@	_toupper.c 	\
+@ELIX_LEVEL_1_FALSE@	towctrans.c 	\
+@ELIX_LEVEL_1_FALSE@	towlower.c 	\
+@ELIX_LEVEL_1_FALSE@	towupper.c 	\
+@ELIX_LEVEL_1_FALSE@	wctrans.c 	\
+@ELIX_LEVEL_1_FALSE@	wctype.c
+
+@ELIX_LEVEL_1_TRUE@ELIX_SOURCES = 
 libctype_la_LDFLAGS = -Xcompiler -nostdlib
 @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libctype.la
-@USE_LIBTOOL_TRUE@libctype_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@libctype_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libctype_la_DEPENDENCIES = $(LIB_OBJS)
+@USE_LIBTOOL_TRUE@libctype_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
 @USE_LIBTOOL_FALSE@noinst_DATA = 
 @USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
 @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
 @USE_LIBTOOL_FALSE@lib_a_CFLAGS = $(AM_CFLAGS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
 CHEWOUT_FILES = \
 	isalnum.def	\
 	isalpha.def	\