From 4c46630639ab25de2a90507694d369116a26059b Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 31 Jan 2000 15:15:10 +0000
Subject: Patch rtems-rc-20000118-1.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> that contains:

  * cleanups to configuration files
  * A reworked gccnewlib.spec.in: I have reformated it for enhanced
    readability and added more rtems-base packages. It now should be free of
    any installation conflicts (If there still remain some, they should be
    regarded as bugs).
  * A fix to the bin2boot RTEMS_BSP issue (make RTEMS_BSP="pc386 pc486"
    now works).
  * removes libbsp/bare/wrapup
  * Further cleanups
---
 c/src/lib/configure.in                         |  3 --
 c/src/lib/libbsp/a29k/configure.in             |  2 -
 c/src/lib/libbsp/bare/Makefile.am              |  8 +---
 c/src/lib/libbsp/bare/configure.in             |  2 -
 c/src/lib/libbsp/bare/include/Makefile.am      | 13 ++++--
 c/src/lib/libbsp/bare/wrapup/Makefile.in       | 64 --------------------------
 c/src/lib/libbsp/hppa1.1/configure.in          |  2 -
 c/src/lib/libbsp/i386/configure.in             |  2 -
 c/src/lib/libbsp/i386/pc386/tools/configure.in |  1 +
 c/src/lib/libbsp/i960/configure.in             |  2 -
 c/src/lib/libbsp/i960/cvme961/configure.in     |  2 +-
 c/src/lib/libbsp/i960/rxgen960/configure.in    |  2 +-
 c/src/lib/libbsp/m68k/configure.in             |  2 -
 c/src/lib/libbsp/mips/configure.in             |  2 -
 c/src/lib/libbsp/mips64orion/configure.in      |  2 -
 c/src/lib/libbsp/no_cpu/configure.in           |  2 -
 c/src/lib/libbsp/sh/configure.in               |  2 -
 c/src/lib/libbsp/sparc/configure.in            |  2 -
 c/src/lib/libbsp/unix/configure.in             |  2 -
 c/src/lib/libcpu/a29k/clock/ckinit.c           |  2 +-
 c/src/lib/libcpu/a29k/clock/clock.h            |  4 +-
 c/src/lib/libcpu/a29k/timer/Makefile.am        |  3 +-
 c/src/lib/libcpu/a29k/timer/timer.c            |  2 +-
 c/src/lib/libcpu/a29k/timer/timerisr.c         |  2 +-
 24 files changed, 19 insertions(+), 111 deletions(-)
 delete mode 100644 c/src/lib/libbsp/bare/wrapup/Makefile.in

(limited to 'c/src/lib')

diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in
index 2128e569a7..f659403060 100644
--- a/c/src/lib/configure.in
+++ b/c/src/lib/configure.in
@@ -51,9 +51,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 
 AC_CONFIG_SUBDIRS($cfg_subdirs)
 
-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
diff --git a/c/src/lib/libbsp/a29k/configure.in b/c/src/lib/libbsp/a29k/configure.in
index 0e129d5302..6488100467 100644
--- a/c/src/lib/libbsp/a29k/configure.in
+++ b/c/src/lib/libbsp/a29k/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-a29k,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/bare/Makefile.am b/c/src/lib/libbsp/bare/Makefile.am
index 4c1ea45a78..db8ee902e2 100644
--- a/c/src/lib/libbsp/bare/Makefile.am
+++ b/c/src/lib/libbsp/bare/Makefile.am
@@ -9,13 +9,7 @@ include $(top_srcdir)/../bsp.am
 
 SUBDIRS = . include
 
-$(PROJECT_RELEASE)/bsp_specs: bsp_specs
-	$(INSTALL_DATA) $< $@
-
-all-local : $(PREINSTALL_FILES)
-
-EXTRA_DIST = \
-build-tools bsp_specs do-bare-bsp-build
+EXTRA_DIST = bsp_specs build-tools do-bare-bsp-build
 
 include $(top_srcdir)/../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/bare/configure.in b/c/src/lib/libbsp/bare/configure.in
index 218ce78889..517102de4b 100644
--- a/c/src/lib/libbsp/bare/configure.in
+++ b/c/src/lib/libbsp/bare/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-bare,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/bare/include/Makefile.am b/c/src/lib/libbsp/bare/include/Makefile.am
index 46ceb70cac..8b4b05be9d 100644
--- a/c/src/lib/libbsp/bare/include/Makefile.am
+++ b/c/src/lib/libbsp/bare/include/Makefile.am
@@ -3,13 +3,11 @@
 ## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
+
 H_FILES = bsp.h
-noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES += \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
-$(PROJECT_INCLUDE)/coverhd.h
+$(PROJECT_INCLUDE):
+	$(mkinstalldirs) $@
 
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
@@ -17,6 +15,11 @@ $(PROJECT_INCLUDE)/%.h: %.h
 $(PROJECT_INCLUDE)/coverhd.h: $(srcdir)/../../shared/include/coverhd.h
 	$(INSTALL_DATA) $< $@
 
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
+    $(PROJECT_INCLUDE)/coverhd.h
+
 all-local: $(TMPINSTALL_FILES)
 
+EXTRA_DIST = bsp.h
+
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/bare/wrapup/Makefile.in b/c/src/lib/libbsp/bare/wrapup/Makefile.in
deleted file mode 100644
index ac79fc207a..0000000000
--- a/c/src/lib/libbsp/bare/wrapup/Makefile.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = bare/wrapup
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-BSP_PIECES =
-GENERIC_PIECES =
-
-# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
-    $(foreach piece, $(GENERIC_PIECES), \
-    ../../../$(piece)/$(ARCH)/$(piece).rel)
-LIB = $(ARCH)/libbsp.a
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL = @INSTALL@
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(LIB): ${OBJS}
-	$(make-library)
-
-all: ${ARCH} $(SRCS) $(LIB)
-	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
-
-$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
-	$(INSTALL_DATA) $< $@
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/lib/libbsp/hppa1.1/configure.in b/c/src/lib/libbsp/hppa1.1/configure.in
index eead2adc73..27118a3377 100644
--- a/c/src/lib/libbsp/hppa1.1/configure.in
+++ b/c/src/lib/libbsp/hppa1.1/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-hppa1.1,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/i386/configure.in b/c/src/lib/libbsp/i386/configure.in
index e01d89ddac..8538f5a7a7 100644
--- a/c/src/lib/libbsp/i386/configure.in
+++ b/c/src/lib/libbsp/i386/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i386,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/i386/pc386/tools/configure.in b/c/src/lib/libbsp/i386/pc386/tools/configure.in
index ebed8e0411..853d7bfb78 100644
--- a/c/src/lib/libbsp/i386/pc386/tools/configure.in
+++ b/c/src/lib/libbsp/i386/pc386/tools/configure.in
@@ -12,6 +12,7 @@ AM_INIT_AUTOMAKE(rtems-lib-libbsp-i386-pc386-tools,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 AC_EXEEXT
 
+RTEMS_ENV_RTEMSBSP
 AC_PROG_CC
 
 AC_CHECK_FUNCS(strtoul)
diff --git a/c/src/lib/libbsp/i960/configure.in b/c/src/lib/libbsp/i960/configure.in
index acedf644a1..e9b306361c 100644
--- a/c/src/lib/libbsp/i960/configure.in
+++ b/c/src/lib/libbsp/i960/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/i960/cvme961/configure.in b/c/src/lib/libbsp/i960/cvme961/configure.in
index d1e8fd7b77..2fcffc49dd 100644
--- a/c/src/lib/libbsp/i960/cvme961/configure.in
+++ b/c/src/lib/libbsp/i960/cvme961/configure.in
@@ -8,7 +8,7 @@ RTEMS_TOP(../../../../../..)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
-AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-no_cpu-cvme961,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960-cvme961,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_LIBCDIR
diff --git a/c/src/lib/libbsp/i960/rxgen960/configure.in b/c/src/lib/libbsp/i960/rxgen960/configure.in
index 7c934b2f13..f974725f55 100644
--- a/c/src/lib/libbsp/i960/rxgen960/configure.in
+++ b/c/src/lib/libbsp/i960/rxgen960/configure.in
@@ -8,7 +8,7 @@ RTEMS_TOP(../../../../../..)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
-AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-no_cpu-rxgen960,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-i960-rxgen960,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_LIBCDIR
diff --git a/c/src/lib/libbsp/m68k/configure.in b/c/src/lib/libbsp/m68k/configure.in
index ce0e518d26..3dac2230e9 100644
--- a/c/src/lib/libbsp/m68k/configure.in
+++ b/c/src/lib/libbsp/m68k/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/mips/configure.in b/c/src/lib/libbsp/mips/configure.in
index 1ccc8b0fe1..63c7590854 100644
--- a/c/src/lib/libbsp/mips/configure.in
+++ b/c/src/lib/libbsp/mips/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-mips64orion,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/mips64orion/configure.in b/c/src/lib/libbsp/mips64orion/configure.in
index 1ccc8b0fe1..63c7590854 100644
--- a/c/src/lib/libbsp/mips64orion/configure.in
+++ b/c/src/lib/libbsp/mips64orion/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-mips64orion,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/no_cpu/configure.in b/c/src/lib/libbsp/no_cpu/configure.in
index 44ced6684c..6da3fd2deb 100644
--- a/c/src/lib/libbsp/no_cpu/configure.in
+++ b/c/src/lib/libbsp/no_cpu/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-no_cpu,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/sh/configure.in b/c/src/lib/libbsp/sh/configure.in
index 6659f81adc..0019a783ab 100644
--- a/c/src/lib/libbsp/sh/configure.in
+++ b/c/src/lib/libbsp/sh/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sh,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/sparc/configure.in b/c/src/lib/libbsp/sparc/configure.in
index 66e3417aae..4fbf519a74 100644
--- a/c/src/lib/libbsp/sparc/configure.in
+++ b/c/src/lib/libbsp/sparc/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-sparc,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/unix/configure.in b/c/src/lib/libbsp/unix/configure.in
index cd6ad2a797..7bf7d9998e 100644
--- a/c/src/lib/libbsp/unix/configure.in
+++ b/c/src/lib/libbsp/unix/configure.in
@@ -11,8 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-unix,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_LIBCDIR
-
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
diff --git a/c/src/lib/libcpu/a29k/clock/ckinit.c b/c/src/lib/libcpu/a29k/clock/ckinit.c
index 7d2ca5fe8e..b52c7aaa63 100644
--- a/c/src/lib/libcpu/a29k/clock/ckinit.c
+++ b/c/src/lib/libcpu/a29k/clock/ckinit.c
@@ -10,7 +10,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  ckinit.c,v 1.5 1995/10/30 21:53:23 joel Exp
+ *  $Id$
  */
 
 #ifndef lint
diff --git a/c/src/lib/libcpu/a29k/clock/clock.h b/c/src/lib/libcpu/a29k/clock/clock.h
index 61b1c5905a..5e45157c86 100644
--- a/c/src/lib/libcpu/a29k/clock/clock.h
+++ b/c/src/lib/libcpu/a29k/clock/clock.h
@@ -1,4 +1,6 @@
-/* @(#)clock.h       03/15/96     1.1 */
+/*
+ * $Id$
+ */
 
 extern void a29k_init_timer( unsigned32 timer_clock_interval );
 extern void a29k_disable_timer(void);
diff --git a/c/src/lib/libcpu/a29k/timer/Makefile.am b/c/src/lib/libcpu/a29k/timer/Makefile.am
index 61e9235ee9..f17c802679 100644
--- a/c/src/lib/libcpu/a29k/timer/Makefile.am
+++ b/c/src/lib/libcpu/a29k/timer/Makefile.am
@@ -1,7 +1,6 @@
 ## 
-## Makefile,v 1.2 1995/05/31 16:56:37 joel Exp
+## $Id$
 ## 
-## @(#)Makefile        03/26/96     1.2
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/lib/libcpu/a29k/timer/timer.c b/c/src/lib/libcpu/a29k/timer/timer.c
index 39834fc399..1391106828 100644
--- a/c/src/lib/libcpu/a29k/timer/timer.c
+++ b/c/src/lib/libcpu/a29k/timer/timer.c
@@ -16,7 +16,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  timer.c,v 1.2 1995/05/31 16:56:39 joel Exp
+ *  $Id$
  */
 
 #ifndef lint
diff --git a/c/src/lib/libcpu/a29k/timer/timerisr.c b/c/src/lib/libcpu/a29k/timer/timerisr.c
index 82c3c80d9f..3567222cfa 100644
--- a/c/src/lib/libcpu/a29k/timer/timerisr.c
+++ b/c/src/lib/libcpu/a29k/timer/timerisr.c
@@ -21,7 +21,7 @@
  *  to the copyright license under the clause at DFARS 252.227-7013.  This
  *  notice must appear in all copies of this file and its derivatives.
  *
- *  timerisr.c,v 1.2 1995/05/31 16:56:40 joel Exp
+ *  $Id$
  */
 
 #ifndef lint
-- 
cgit v1.2.3