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.

1 files changed, 60 insertions, 60 deletions

diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am
index 16b185e86..b64080dea 100644
--- a/newlib/libc/sys/linux/Makefile.am
+++ b/newlib/libc/sys/linux/Makefile.am
@@ -40,6 +40,7 @@ GENERAL_SOURCES = \
 	funlockfile.c \
 	getdate.c \
 	getdate_err.c \
+	gethostid.c \
 	gethostname.c \
 	getreent.c \
 	ids.c \
@@ -48,6 +49,7 @@ GENERAL_SOURCES = \
 	ipc.c \
 	linux.c \
 	mallinfor.c \
+	malloc.c \
 	mallocr.c \
 	mallstatsr.c \
 	mmap.c \
@@ -79,6 +81,7 @@ GENERAL_SOURCES = \
 	sched.c \
 	select.c \
 	seteuid.c \
+	sethostid.c \
 	sethostname.c \
 	shm_open.c \
 	shm_unlink.c \
@@ -103,62 +106,62 @@ GENERAL_SOURCES = \
 	usleep.c \
 	versionsort.c 
 
-ELIX_2_OBJS = \
-	aio64.$(oext) \
-	confstr.$(oext) \
-	ctermid.$(oext) \
-	fclean.$(oext) \
-	fpathconf.$(oext) \
-	fstab.$(oext) \
-	fstatvfs.$(oext) \
-	fstatvfs64.$(oext) \
-	ftw.$(oext) \
-	ftw64.$(oext) \
-	getopt.$(oext) \
-	getopt1.$(oext) \
-	getrlimit64.$(oext) \
-	getwd.$(oext) \
-	io64.$(oext) \
-	malign.$(oext) \
-	malignr.$(oext) \
-	malloptr.$(oext) \
-	mcheck.$(oext) \
-	mntent.$(oext) \
-	mntent_r.$(oext) \
-	pathconf.$(oext) \
-	pread64.$(oext) \
-	pvallocr.$(oext) \
-	pwrite64.$(oext) \
-	readdir64.$(oext) \
-	realpath.$(oext) \
-	scandir64.$(oext) \
-	setrlimit64.$(oext) \
-	statvfs.$(oext) \
-	statvfs64.$(oext) \
-	ttyname_r.$(oext) \
-	utimes.$(oext) \
-	vallocr.$(oext) \
-	versionsort64.$(oext)
-
-ELIX_3_OBJS = \
-	system.$(oext) \
-	wait.$(oext)
-
-ELIX_4_OBJS = \
-	getlogin.$(oext) \
-	getpwent.$(oext) \
-	stack.$(oext)
+ELIX_2_SOURCES = \
+	aio64.c \
+	confstr.c \
+	ctermid.c \
+	fclean.c \
+	fpathconf.c \
+	fstab.c \
+	fstatvfs.c \
+	fstatvfs64.c \
+	ftw.c \
+	ftw64.c \
+	getopt.c \
+	getopt1.c \
+	getrlimit64.c \
+	getwd.c \
+	io64.c \
+	malign.c \
+	malignr.c \
+	malloptr.c \
+	mcheck.c \
+	mntent.c \
+	mntent_r.c \
+	pathconf.c \
+	pread64.c \
+	pvallocr.c \
+	pwrite64.c \
+	readdir64.c \
+	realpath.c \
+	scandir64.c \
+	setrlimit64.c \
+	statvfs.c \
+	statvfs64.c \
+	ttyname_r.c \
+	utimes.c \
+	vallocr.c \
+	versionsort64.c
+
+ELIX_3_SOURCES = \
+	system.c \
+	wait.c
+
+ELIX_4_SOURCES = \
+	getlogin.c \
+	getpwent.c \
+	stack.c
 
 if ELIX_LEVEL_1
-LIB_OBJS =
+ELIX_SOURCES =
 else
 if ELIX_LEVEL_2
-LIB_OBJS = $(ELIX_2_OBJS)
+ELIX_SOURCES = $(ELIX_2_SOURCES)
 else
 if ELIX_LEVEL_3
-LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
+ELIX_SOURCES = $(ELIX_2_SOURCES) $(ELIX_3_SOURCES)
 else
-LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
+ELIX_SOURCES = $(ELIX_2_SOURCES) $(ELIX_3_SOURCES) $(ELIX_4_SOURCES)
 endif
 endif
 endif
@@ -170,28 +173,25 @@ SIGNAL_H = /usr/include/asm/signal.h
 liblinux_la_LDFLAGS = -Xcompiler -nostdlib
 
 ADD_OBJS = \
-	malloc.$(oext) \
-	gethostid.$(oext) \
-	sethostid.$(oext) \
 	$(LINUX_MACH_LIB)
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = liblinux.la
-liblinux_la_SOURCES = $(GENERAL_SOURCES)
-liblinux_la_LIBADD = $(ADD_OBJS) $(LIB_OBJS)
-liblinux_la_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS)
+liblinux_la_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
+liblinux_la_LIBADD = $(ADD_OBJS)
+liblinux_la_DEPENDENCIES = $(ADD_OBJS)
 LIBC_COMPILE = $(LTCOMPILE)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(ADD_OBJS) $(LIB_OBJS)
+lib_a_SOURCES = $(GENERAL_SOURCES) $(ELIX_SOURCES)
+lib_a_LIBADD = $(ADD_OBJS)
+lib_a_DEPENDENCIES = $(ADD_OBJS)
 lib_a_CFLAGS = $(AM_CFLAGS)
-lib_a_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS)
 LIBC_COMPILE = $(COMPILE)
 noinst_DATA =
 
-lib.a:  $(ADD_OBJS) $(LIB_OBJS) $(lib_a_OBJECTS)
+lib.a:  $(lib_a_OBJECTS)
 	rm -f $@
 	rm -rf tmp
 	mkdir tmp
@@ -227,7 +227,7 @@ crt0.o: machine/crt0.o
 
 machine/crt0.o: ; @true
 
-sig.$(oext):	siglist.inc
+$(lpfx)sig.$(oext):	siglist.inc
 
 siglist.inc:
 		$(AWK) '{ max = 32 } \