From 33e6983058494443108379121129b6a81e4e3ec1 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 9 Dec 2002 10:39:18 +0000
Subject: 2002-12-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* wrapup/Makefile.am: Remove *_OBJS, use LIBS+= instead.
	* configure.ac: Require autoconf >= 2.54, automake-1.7.2.
---
 cpukit/ChangeLog          |  5 +++++
 cpukit/configure.ac       |  4 ++--
 cpukit/wrapup/Makefile.am | 38 ++++++++++++++++----------------------
 3 files changed, 23 insertions(+), 24 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 44c227268f..a5a5182008 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* wrapup/Makefile.am: Remove *_OBJS, use LIBS+= instead.
+	* configure.ac: Require autoconf >= 2.54, automake-1.7.2.
+
 2002-12-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* wrapup/Makefile.am: Reflect changes to score/.
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index a3af558e14..fee6bdd0fa 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -2,7 +2,7 @@
 ## 
 ## $Id$
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.54)
 AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([score])
 RTEMS_TOP(..)
@@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6])
+AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
 AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_MULTILIB
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 88c0673d93..31848a0661 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -8,50 +8,44 @@ include $(top_srcdir)/automake/multilib.am
 include $(top_srcdir)/automake/compile.am
 include $(top_srcdir)/automake/lib.am
 
+LIBS =
 if LIBSCORECPU
-CPU_OBJS = ../score/cpu/$(RTEMS_CPU)/$(ARCH)/libscorecpu.a
+LIBS += ../score/cpu/$(RTEMS_CPU)/$(ARCH)/libscorecpu.a
 endif
-CORE_OBJS = ../score/$(ARCH)/libscore.a
-SAPI_OBJS = ../sapi/$(ARCH)/libsapi.a
-RTEMS_OBJS = ../rtems/$(ARCH)/librtems.a
+LIBS += ../score/$(ARCH)/libscore.a
+LIBS += ../sapi/$(ARCH)/libsapi.a
+LIBS += ../rtems/$(ARCH)/librtems.a
 
 if HAS_POSIX
-POSIX_OBJS = ../posix/$(ARCH)/libposix.a
+LIBS += ../posix/$(ARCH)/libposix.a
 endif
 
 if HAS_ITRON
-ITRON_OBJS = ../itron/$(ARCH)/libitron.a
+LIBS += ../itron/$(ARCH)/libitron.a
 endif
 
-LIBCSUPPORT_OBJS = ../libcsupport/$(ARCH)/libcsupport.a
+LIBS += ../libcsupport/$(ARCH)/libcsupport.a
 
-LIBBLOCK_OBJS = ../libblock/$(ARCH)/libblock.a
+LIBS += ../libblock/$(ARCH)/libblock.a
 if !UNIX
-LIBDOSFS_OBJS = ../libfs/src/dosfs/$(ARCH)/libdosfs.a
+LIBS += ../libfs/src/dosfs/$(ARCH)/libdosfs.a
 endif
-LIBIMFS_OBJS = ../libfs/src/imfs/$(ARCH)/libimfs.a
+LIBS += ../libfs/src/imfs/$(ARCH)/libimfs.a
 
 if HAS_NETWORKING
-NETWORKING_OBJS = \
-    ../libnetworking/wrapup/$(ARCH)/libnetworking.a
+LIBS += ../libnetworking/wrapup/$(ARCH)/libnetworking.a
 endif
 
 if LIBRPC
-LIBRPC_OBJS = \
-    ../librpc/src/rpc/$(ARCH)/librpc.a \
-    ../librpc/src/xdr/$(ARCH)/libxdr.a
+LIBS += ../librpc/src/rpc/$(ARCH)/librpc.a
+LIBS += ../librpc/src/xdr/$(ARCH)/libxdr.a
 endif
 
-OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS) \
-    $(POSIX_OBJS) $(ITRON_OBJS) $(LIBCSUPPORT_OBJS) \
-    $(LIBBLOCK_OBJS) $(LIBDOSFS_OBJS) $(LIBIMFS_OBJS) \
-    $(NETWORKING_OBJS) $(LIBRPC_OBJS)
-
-$(LIB): ${OBJS}
+$(LIB): ${LIBS}
 	rm -f $@
 	test -d $(ARCH) || mkdir $(ARCH)
 	rm -rf $(ARCH)/*
-	for f in $(OBJS); do \
+	for f in $(LIBS); do \
 	  case $$f in \
 	  *.$(OBJEXT) | *.rel) \
 	    if test -f $(ARCH)/`basename $$f`; then \
-- 
cgit v1.2.3