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.

6 files changed, 142 insertions, 131 deletions

diff --git a/newlib/libc/iconv/ccs/Makefile.am b/newlib/libc/iconv/ccs/Makefile.am
index b6c28aad2..e1ad6f917 100644
--- a/newlib/libc/iconv/ccs/Makefile.am
+++ b/newlib/libc/iconv/ccs/Makefile.am
@@ -21,30 +21,28 @@ cns11643_plane1.c cns11643_plane2.c cns11643_plane14.c
 
 ## The following interfaces are EL/IX level 2
 if ELIX_LEVEL_1
-LIB_OBJS = ccsbi.$(oext) \
-iso_8859_10.$(oext) iso_8859_13.$(oext) iso_8859_14.$(oext) iso_8859_15.$(oext) \
-iso_8859_1.$(oext) iso_8859_2.$(oext) iso_8859_3.$(oext) iso_8859_4.$(oext) \
-iso_8859_5.$(oext) iso_8859_6.$(oext) iso_8859_7.$(oext) iso_8859_8.$(oext) \
-iso_8859_9.$(oext) iso_8859_11.$(oext) \
-win_1250.$(oext) win_1252.$(oext) win_1254.$(oext) \
-win_1256.$(oext) win_1258.$(oext) win_1251.$(oext) \
-win_1253.$(oext) win_1255.$(oext) win_1257.$(oext) \
-koi8_r.$(oext) koi8_u.$(oext) koi8_ru.$(oext) koi8_uni.$(oext)
-iso_ir_111.$(oext) \
-big5.$(oext) \
-cp775.$(oext) cp850.$(oext) cp852.$(oext) cp855.$(oext) cp866.$(oext) \
-jis_x0212_1990.$(oext) jis_x0201_1976.$(oext) jis_x0208_1990.$(oext) ksx1001.$(oext) \
-cns11643_plane1.$(oext) cns11643_plane2.$(oext) cns11643_plane14.$(oext)
+ELIX_SOURCES = ccsbi.c \
+iso_8859_10.c iso_8859_13.c iso_8859_14.c iso_8859_15.c \
+iso_8859_1.c iso_8859_2.c iso_8859_3.c iso_8859_4.c \
+iso_8859_5.c iso_8859_6.c iso_8859_7.c iso_8859_8.c \
+iso_8859_9.c iso_8859_11.c \
+win_1250.c win_1252.c win_1254.c \
+win_1256.c win_1258.c win_1251.c \
+win_1253.c win_1255.c win_1257.c \
+koi8_r.c koi8_u.c koi8_ru.c koi8_uni.c
+iso_ir_111.c \
+big5.c \
+cp775.c cp850.c cp852.c cp855.c cp866.c \
+jis_x0212_1990.c jis_x0201_1976.c jis_x0208_1990.c ksx1001.c \
+cns11643_plane1.c cns11643_plane2.c cns11643_plane14.c
 
 else
-LIB_OBJS =
+ELIX_SOURCES =
 endif
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
+lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
 lib_a_CFLAGS = $(AM_CFLAGS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
 noinst_DATA =
 
 SUBDIRS=binary
diff --git a/newlib/libc/iconv/ccs/Makefile.in b/newlib/libc/iconv/ccs/Makefile.in
index 18ab8fcc8..559dd5a2f 100644
--- a/newlib/libc/iconv/ccs/Makefile.in
+++ b/newlib/libc/iconv/ccs/Makefile.in
@@ -52,21 +52,7 @@ CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 lib_a_AR = $(AR) $(ARFLAGS)
-@ELIX_LEVEL_1_TRUE@am__DEPENDENCIES_1 = ccsbi.$(oext) \
-@ELIX_LEVEL_1_TRUE@	iso_8859_10.$(oext) iso_8859_13.$(oext) \
-@ELIX_LEVEL_1_TRUE@	iso_8859_14.$(oext) iso_8859_15.$(oext) \
-@ELIX_LEVEL_1_TRUE@	iso_8859_1.$(oext) iso_8859_2.$(oext) \
-@ELIX_LEVEL_1_TRUE@	iso_8859_3.$(oext) iso_8859_4.$(oext) \
-@ELIX_LEVEL_1_TRUE@	iso_8859_5.$(oext) iso_8859_6.$(oext) \
-@ELIX_LEVEL_1_TRUE@	iso_8859_7.$(oext) iso_8859_8.$(oext) \
-@ELIX_LEVEL_1_TRUE@	iso_8859_9.$(oext) iso_8859_11.$(oext) \
-@ELIX_LEVEL_1_TRUE@	win_1250.$(oext) win_1252.$(oext) \
-@ELIX_LEVEL_1_TRUE@	win_1254.$(oext) win_1256.$(oext) \
-@ELIX_LEVEL_1_TRUE@	win_1258.$(oext) win_1251.$(oext) \
-@ELIX_LEVEL_1_TRUE@	win_1253.$(oext) win_1255.$(oext) \
-@ELIX_LEVEL_1_TRUE@	win_1257.$(oext) koi8_r.$(oext) \
-@ELIX_LEVEL_1_TRUE@	koi8_u.$(oext) koi8_ru.$(oext) \
-@ELIX_LEVEL_1_TRUE@	koi8_uni.$(oext)
+lib_a_LIBADD =
 am__objects_1 = lib_a-ccsbi.$(OBJEXT) lib_a-iso_8859_10.$(OBJEXT) \
 	lib_a-iso_8859_13.$(OBJEXT) lib_a-iso_8859_14.$(OBJEXT) \
 	lib_a-iso_8859_15.$(OBJEXT) lib_a-iso_8859_1.$(OBJEXT) \
@@ -89,7 +75,35 @@ am__objects_1 = lib_a-ccsbi.$(OBJEXT) lib_a-iso_8859_10.$(OBJEXT) \
 	lib_a-ksx1001.$(OBJEXT) lib_a-cns11643_plane1.$(OBJEXT) \
 	lib_a-cns11643_plane2.$(OBJEXT) \
 	lib_a-cns11643_plane14.$(OBJEXT)
-am_lib_a_OBJECTS = $(am__objects_1)
+@ELIX_LEVEL_1_TRUE@am__objects_2 = lib_a-ccsbi.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_10.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_13.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_14.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_15.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_1.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_2.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_3.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_4.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_5.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_6.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_7.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_8.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_9.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-iso_8859_11.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-win_1250.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-win_1252.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-win_1254.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-win_1256.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-win_1258.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-win_1251.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-win_1253.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-win_1255.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-win_1257.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-koi8_r.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-koi8_u.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-koi8_ru.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-koi8_uni.$(OBJEXT)
+am_lib_a_OBJECTS = $(am__objects_1) $(am__objects_2)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp =
@@ -268,22 +282,20 @@ cp775.c cp850.c cp852.c cp855.c cp866.c \
 jis_x0212_1990.c jis_x0201_1976.c jis_x0208_1990.c ksx1001.c \
 cns11643_plane1.c cns11643_plane2.c cns11643_plane14.c
 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = 
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = ccsbi.$(oext) \
-@ELIX_LEVEL_1_TRUE@iso_8859_10.$(oext) iso_8859_13.$(oext) iso_8859_14.$(oext) iso_8859_15.$(oext) \
-@ELIX_LEVEL_1_TRUE@iso_8859_1.$(oext) iso_8859_2.$(oext) iso_8859_3.$(oext) iso_8859_4.$(oext) \
-@ELIX_LEVEL_1_TRUE@iso_8859_5.$(oext) iso_8859_6.$(oext) iso_8859_7.$(oext) iso_8859_8.$(oext) \
-@ELIX_LEVEL_1_TRUE@iso_8859_9.$(oext) iso_8859_11.$(oext) \
-@ELIX_LEVEL_1_TRUE@win_1250.$(oext) win_1252.$(oext) win_1254.$(oext) \
-@ELIX_LEVEL_1_TRUE@win_1256.$(oext) win_1258.$(oext) win_1251.$(oext) \
-@ELIX_LEVEL_1_TRUE@win_1253.$(oext) win_1255.$(oext) win_1257.$(oext) \
-@ELIX_LEVEL_1_TRUE@koi8_r.$(oext) koi8_u.$(oext) koi8_ru.$(oext) koi8_uni.$(oext)
+@ELIX_LEVEL_1_FALSE@ELIX_SOURCES = 
+@ELIX_LEVEL_1_TRUE@ELIX_SOURCES = ccsbi.c \
+@ELIX_LEVEL_1_TRUE@iso_8859_10.c iso_8859_13.c iso_8859_14.c iso_8859_15.c \
+@ELIX_LEVEL_1_TRUE@iso_8859_1.c iso_8859_2.c iso_8859_3.c iso_8859_4.c \
+@ELIX_LEVEL_1_TRUE@iso_8859_5.c iso_8859_6.c iso_8859_7.c iso_8859_8.c \
+@ELIX_LEVEL_1_TRUE@iso_8859_9.c iso_8859_11.c \
+@ELIX_LEVEL_1_TRUE@win_1250.c win_1252.c win_1254.c \
+@ELIX_LEVEL_1_TRUE@win_1256.c win_1258.c win_1251.c \
+@ELIX_LEVEL_1_TRUE@win_1253.c win_1255.c win_1257.c \
+@ELIX_LEVEL_1_TRUE@koi8_r.c koi8_u.c koi8_ru.c koi8_uni.c
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
+lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
 lib_a_CFLAGS = $(AM_CFLAGS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
 noinst_DATA = 
 SUBDIRS = binary
 CHEWOUT_FILES = ccs.def
@@ -835,11 +847,11 @@ uninstall-info: uninstall-info-recursive
 	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am uninstall-info-am
 
-@ELIX_LEVEL_1_TRUE@iso_ir_111.$(oext) \
-@ELIX_LEVEL_1_TRUE@big5.$(oext) \
-@ELIX_LEVEL_1_TRUE@cp775.$(oext) cp850.$(oext) cp852.$(oext) cp855.$(oext) cp866.$(oext) \
-@ELIX_LEVEL_1_TRUE@jis_x0212_1990.$(oext) jis_x0201_1976.$(oext) jis_x0208_1990.$(oext) ksx1001.$(oext) \
-@ELIX_LEVEL_1_TRUE@cns11643_plane1.$(oext) cns11643_plane2.$(oext) cns11643_plane14.$(oext)
+@ELIX_LEVEL_1_TRUE@iso_ir_111.c \
+@ELIX_LEVEL_1_TRUE@big5.c \
+@ELIX_LEVEL_1_TRUE@cp775.c cp850.c cp852.c cp855.c cp866.c \
+@ELIX_LEVEL_1_TRUE@jis_x0212_1990.c jis_x0201_1976.c jis_x0208_1990.c ksx1001.c \
+@ELIX_LEVEL_1_TRUE@cns11643_plane1.c cns11643_plane2.c cns11643_plane14.c
 
 .c.def:
 	$(CHEW) < $< > $*.def 2> $*.ref
diff --git a/newlib/libc/iconv/ces/Makefile.am b/newlib/libc/iconv/ces/Makefile.am
index d712654a8..92a19d2e4 100644
--- a/newlib/libc/iconv/ces/Makefile.am
+++ b/newlib/libc/iconv/ces/Makefile.am
@@ -19,27 +19,25 @@ GENERAL_SOURCES = \
 
 ## The following interfaces are EL/IX level 2
 if ELIX_LEVEL_1
-LIB_OBJS = \
-	utf-8.$(oext) \
-	utf-16.$(oext) \
-	ucs-2.$(oext) \
-	us-ascii.$(oext) \
-	ucs-4.$(oext) \
-	ucs-2-internal.$(oext) \
-	ucs-4-internal.$(oext) \
-	cesbi.$(oext) \
-	table.$(oext) \
-	table-pcs.$(oext) \
-	euc.$(oext)
+ELIX_SOURCES = \
+	utf-8.c \
+	utf-16.c \
+	ucs-2.c \
+	us-ascii.c \
+	ucs-4.c \
+	ucs-2-internal.c \
+	ucs-4-internal.c \
+	cesbi.c \
+	table.c \
+	table-pcs.c \
+	euc.c
 else
-LIB_OBJS = 
+ELIX_SOURCES = 
 endif
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
+lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
 lib_a_CFLAGS = $(AM_CFLAGS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
 noinst_DATA =
 
 include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libc/iconv/ces/Makefile.in b/newlib/libc/iconv/ces/Makefile.in
index cb5e302dc..58f597721 100644
--- a/newlib/libc/iconv/ces/Makefile.in
+++ b/newlib/libc/iconv/ces/Makefile.in
@@ -52,18 +52,24 @@ CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 lib_a_AR = $(AR) $(ARFLAGS)
-@ELIX_LEVEL_1_TRUE@am__DEPENDENCIES_1 = utf-8.$(oext) utf-16.$(oext) \
-@ELIX_LEVEL_1_TRUE@	ucs-2.$(oext) us-ascii.$(oext) \
-@ELIX_LEVEL_1_TRUE@	ucs-4.$(oext) ucs-2-internal.$(oext) \
-@ELIX_LEVEL_1_TRUE@	ucs-4-internal.$(oext) cesbi.$(oext) \
-@ELIX_LEVEL_1_TRUE@	table.$(oext) table-pcs.$(oext) euc.$(oext)
+lib_a_LIBADD =
 am__objects_1 = lib_a-utf-8.$(OBJEXT) lib_a-utf-16.$(OBJEXT) \
 	lib_a-ucs-2.$(OBJEXT) lib_a-us-ascii.$(OBJEXT) \
 	lib_a-ucs-4.$(OBJEXT) lib_a-ucs-2-internal.$(OBJEXT) \
 	lib_a-ucs-4-internal.$(OBJEXT) lib_a-cesbi.$(OBJEXT) \
 	lib_a-table.$(OBJEXT) lib_a-table-pcs.$(OBJEXT) \
 	lib_a-euc.$(OBJEXT)
-am_lib_a_OBJECTS = $(am__objects_1)
+@ELIX_LEVEL_1_TRUE@am__objects_2 = lib_a-utf-8.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-utf-16.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-ucs-2.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-us-ascii.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-ucs-4.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-ucs-2-internal.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-ucs-4-internal.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-cesbi.$(OBJEXT) lib_a-table.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-table-pcs.$(OBJEXT) \
+@ELIX_LEVEL_1_TRUE@	lib_a-euc.$(OBJEXT)
+am_lib_a_OBJECTS = $(am__objects_1) $(am__objects_2)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp =
@@ -233,25 +239,23 @@ GENERAL_SOURCES = \
 	table-pcs.c \
 	euc.c
 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = 
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = \
-@ELIX_LEVEL_1_TRUE@	utf-8.$(oext) \
-@ELIX_LEVEL_1_TRUE@	utf-16.$(oext) \
-@ELIX_LEVEL_1_TRUE@	ucs-2.$(oext) \
-@ELIX_LEVEL_1_TRUE@	us-ascii.$(oext) \
-@ELIX_LEVEL_1_TRUE@	ucs-4.$(oext) \
-@ELIX_LEVEL_1_TRUE@	ucs-2-internal.$(oext) \
-@ELIX_LEVEL_1_TRUE@	ucs-4-internal.$(oext) \
-@ELIX_LEVEL_1_TRUE@	cesbi.$(oext) \
-@ELIX_LEVEL_1_TRUE@	table.$(oext) \
-@ELIX_LEVEL_1_TRUE@	table-pcs.$(oext) \
-@ELIX_LEVEL_1_TRUE@	euc.$(oext)
+@ELIX_LEVEL_1_FALSE@ELIX_SOURCES = 
+@ELIX_LEVEL_1_TRUE@ELIX_SOURCES = \
+@ELIX_LEVEL_1_TRUE@	utf-8.c \
+@ELIX_LEVEL_1_TRUE@	utf-16.c \
+@ELIX_LEVEL_1_TRUE@	ucs-2.c \
+@ELIX_LEVEL_1_TRUE@	us-ascii.c \
+@ELIX_LEVEL_1_TRUE@	ucs-4.c \
+@ELIX_LEVEL_1_TRUE@	ucs-2-internal.c \
+@ELIX_LEVEL_1_TRUE@	ucs-4-internal.c \
+@ELIX_LEVEL_1_TRUE@	cesbi.c \
+@ELIX_LEVEL_1_TRUE@	table.c \
+@ELIX_LEVEL_1_TRUE@	table-pcs.c \
+@ELIX_LEVEL_1_TRUE@	euc.c
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
+lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
 lib_a_CFLAGS = $(AM_CFLAGS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
 noinst_DATA = 
 CHEWOUT_FILES = ces.def
 SUFFIXES = .def
diff --git a/newlib/libc/iconv/lib/Makefile.am b/newlib/libc/iconv/lib/Makefile.am
index 017db0b02..d8fd52838 100644
--- a/newlib/libc/iconv/lib/Makefile.am
+++ b/newlib/libc/iconv/lib/Makefile.am
@@ -5,32 +5,30 @@ AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 GENERAL_SOURCES = \
-aliasesi.c \
-ucsconv.c \
-nullconv.c \
-iconv.c \
-aliasesbi.c \
-iconvnls.c
+	aliasesi.c \
+	ucsconv.c \
+	nullconv.c \
+	iconv.c \
+	aliasesbi.c \
+	iconvnls.c
 
 
 ## The following interfaces are EL/IX level 2
 if ELIX_LEVEL_1
-LIB_OBJS =
+ELIX_SOURCES =
 else
-LIB_OBJS = \
-aliasesi.$(oext) \
-ucsconv.$(oext) \
-nullconv.$(oext) \
-iconv.$(oext) \
-aliasesbi.$(oext) \
-iconvnls.$(oext)
+ELIX_SOURCES = \
+	aliasesi.c \
+	ucsconv.c \
+	nullconv.c \
+	iconv.c \
+	aliasesbi.c \
+	iconvnls.c
 endif
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
+lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
 lib_a_CFLAGS = $(AM_CFLAGS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
 noinst_DATA =
 
 include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libc/iconv/lib/Makefile.in b/newlib/libc/iconv/lib/Makefile.in
index ea1eb9786..84def9c7d 100644
--- a/newlib/libc/iconv/lib/Makefile.in
+++ b/newlib/libc/iconv/lib/Makefile.in
@@ -52,14 +52,17 @@ CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 lib_a_AR = $(AR) $(ARFLAGS)
-@ELIX_LEVEL_1_FALSE@am__DEPENDENCIES_1 = aliasesi.$(oext) \
-@ELIX_LEVEL_1_FALSE@	ucsconv.$(oext) nullconv.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iconv.$(oext) aliasesbi.$(oext) \
-@ELIX_LEVEL_1_FALSE@	iconvnls.$(oext)
+lib_a_LIBADD =
 am__objects_1 = lib_a-aliasesi.$(OBJEXT) lib_a-ucsconv.$(OBJEXT) \
 	lib_a-nullconv.$(OBJEXT) lib_a-iconv.$(OBJEXT) \
 	lib_a-aliasesbi.$(OBJEXT) lib_a-iconvnls.$(OBJEXT)
-am_lib_a_OBJECTS = $(am__objects_1)
+@ELIX_LEVEL_1_FALSE@am__objects_2 = lib_a-aliasesi.$(OBJEXT) \
+@ELIX_LEVEL_1_FALSE@	lib_a-ucsconv.$(OBJEXT) \
+@ELIX_LEVEL_1_FALSE@	lib_a-nullconv.$(OBJEXT) \
+@ELIX_LEVEL_1_FALSE@	lib_a-iconv.$(OBJEXT) \
+@ELIX_LEVEL_1_FALSE@	lib_a-aliasesbi.$(OBJEXT) \
+@ELIX_LEVEL_1_FALSE@	lib_a-iconvnls.$(OBJEXT)
+am_lib_a_OBJECTS = $(am__objects_1) $(am__objects_2)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp =
@@ -217,27 +220,25 @@ target_alias = @target_alias@
 AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 GENERAL_SOURCES = \
-aliasesi.c \
-ucsconv.c \
-nullconv.c \
-iconv.c \
-aliasesbi.c \
-iconvnls.c
-
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = \
-@ELIX_LEVEL_1_FALSE@aliasesi.$(oext) \
-@ELIX_LEVEL_1_FALSE@ucsconv.$(oext) \
-@ELIX_LEVEL_1_FALSE@nullconv.$(oext) \
-@ELIX_LEVEL_1_FALSE@iconv.$(oext) \
-@ELIX_LEVEL_1_FALSE@aliasesbi.$(oext) \
-@ELIX_LEVEL_1_FALSE@iconvnls.$(oext)
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
+	aliasesi.c \
+	ucsconv.c \
+	nullconv.c \
+	iconv.c \
+	aliasesbi.c \
+	iconvnls.c
+
+@ELIX_LEVEL_1_FALSE@ELIX_SOURCES = \
+@ELIX_LEVEL_1_FALSE@	aliasesi.c \
+@ELIX_LEVEL_1_FALSE@	ucsconv.c \
+@ELIX_LEVEL_1_FALSE@	nullconv.c \
+@ELIX_LEVEL_1_FALSE@	iconv.c \
+@ELIX_LEVEL_1_FALSE@	aliasesbi.c \
+@ELIX_LEVEL_1_FALSE@	iconvnls.c
+
+@ELIX_LEVEL_1_TRUE@ELIX_SOURCES = 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
+lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
 lib_a_CFLAGS = $(AM_CFLAGS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
 noinst_DATA = 
 CHEWOUT_FILES = iconv.def
 SUFFIXES = .def