From fc067ba5b86a710737b7d7a8385603a5b4318f8f Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Tue, 25 Jun 2002 18:17:25 +0000
Subject: 2002-06-25  Jeff Johnston  <jjohnstn@redhat.com>

        * libc/sys/linux/Makefile.am: Consolidate additional items under
        ADD_OBJS.
        * libc/sys/linux/Makefile.in: Regenerated.
---
 newlib/libc/sys/linux/Makefile.am | 13 +++++++------
 newlib/libc/sys/linux/Makefile.in | 14 ++++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'newlib/libc')

diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am
index 9946e61ed..b7a474127 100644
--- a/newlib/libc/sys/linux/Makefile.am
+++ b/newlib/libc/sys/linux/Makefile.am
@@ -80,22 +80,23 @@ SIGNAL_H = /usr/src/$(shell ls /usr/src/ | grep ^linux | head -n 1)/include/asm/
 
 liblinux_la_LDFLAGS = -Xcompiler -nostdlib
 
-add_objs = 
+ADD_OBJS = \
+	$(LINUX_MACH_LIB)
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = liblinux.la
 liblinux_la_SOURCES = $(LIB_SOURCES)
-liblinux_la_LIBADD = $(LINUX_MACH_LIB) $(add_objs)
-liblinux_la_DEPENDENCIES = $(LINUX_MACH_LIB) $(add_objs)
+liblinux_la_LIBADD = $(ADD_OBJS)
+liblinux_la_DEPENDENCIES = $(ADD_OBJS)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = $(LIB_SOURCES)
-lib_a_LIBADD = $(LINUX_MACH_LIB) $(add_objs)
-lib_a_DEPENDENCIES = $(LINUX_MACH_LIB) $(add_objs)
+lib_a_LIBADD = $(ADD_OBJS)
+lib_a_DEPENDENCIES = $(ADD_OBJS)
 noinst_DATA =
 
-lib.a:  $(LINUX_MACH_LIB) $(lib_a_OBJECTS) $(add_objs)
+lib.a:  $(ADD_OBJS) $(lib_a_OBJECTS)
 	rm -f $@
 	rm -rf tmp
 	mkdir tmp
diff --git a/newlib/libc/sys/linux/Makefile.in b/newlib/libc/sys/linux/Makefile.in
index 43bec6eaa..0ff77e986 100644
--- a/newlib/libc/sys/linux/Makefile.in
+++ b/newlib/libc/sys/linux/Makefile.in
@@ -178,18 +178,20 @@ SIGNAL_H = /usr/src/$(shell ls /usr/src/ | grep ^linux | head -n 1)/include/asm/
 
 liblinux_la_LDFLAGS = -Xcompiler -nostdlib
 
-add_objs = 
+ADD_OBJS = \
+	$(LINUX_MACH_LIB)
+
 
 @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@liblinux.la
 @USE_LIBTOOL_TRUE@liblinux_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@liblinux_la_LIBADD = @USE_LIBTOOL_TRUE@$(LINUX_MACH_LIB) $(add_objs)
-@USE_LIBTOOL_TRUE@liblinux_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LINUX_MACH_LIB) $(add_objs)
+@USE_LIBTOOL_TRUE@liblinux_la_LIBADD = @USE_LIBTOOL_TRUE@$(ADD_OBJS)
+@USE_LIBTOOL_TRUE@liblinux_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(ADD_OBJS)
 @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
 @USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LINUX_MACH_LIB) $(add_objs)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LINUX_MACH_LIB) $(add_objs)
+@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(ADD_OBJS)
+@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(ADD_OBJS)
 
 AM_CFLAGS = -I $(srcdir)/../../stdio
 ACLOCAL_AMFLAGS = -I ../../..
@@ -585,7 +587,7 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
 maintainer-clean
 
 
-@USE_LIBTOOL_FALSE@lib.a:  $(LINUX_MACH_LIB) $(lib_a_OBJECTS) $(add_objs)
+@USE_LIBTOOL_FALSE@lib.a:  $(ADD_OBJS) $(lib_a_OBJECTS)
 @USE_LIBTOOL_FALSE@	rm -f $@
 @USE_LIBTOOL_FALSE@	rm -rf tmp
 @USE_LIBTOOL_FALSE@	mkdir tmp
-- 
cgit v1.2.3