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
2000-01-31 15:15:10 +00:00
parent d2bc265b66
commit 4c46630639
52 changed files with 224 additions and 283 deletions
--- a/c/src/exec/configure.in
+++ b/c/src/exec/configure.in
@@ -69,9 +69,6 @@ fi
 AC_CONFIG_SUBDIRS($cfg_subdirs)
 AC_CONFIG_SUBDIRS(score/cpu/$RTEMS_CPU)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/itron/configure.in
+++ b/c/src/exec/itron/configure.in
@@ -57,9 +57,6 @@ if test "$RTEMS_USE_MACROS" = "yes"; then
 AC_MSG_ERROR(Macros are not implemented for the ITRON API)
 fi

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 ##
 ## FIXME: We configure and build the macros subdirectory, too.
 ## Should probably use AM_CONDITIONALs to disable them in future
--- a/c/src/exec/posix/configure.in
+++ b/c/src/exec/posix/configure.in
@@ -63,9 +63,6 @@ if test "$RTEMS_USE_MACROS" = "yes"; then
 AC_MSG_ERROR(Macros are not implemented for the POSIX API)
 fi

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 ##
 ## FIXME: We configure and build the macros subdirectory, too.
 ## Should probably use AM_CONDITIONALs to disable them in future
--- a/c/src/exec/score/cpu/a29k/configure.in
+++ b/c/src/exec/score/cpu/a29k/configure.in
@@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/hppa1.1/configure.in
+++ b/c/src/exec/score/cpu/hppa1.1/configure.in
@@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/i386/configure.in
+++ b/c/src/exec/score/cpu/i386/configure.in
@@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/i960/configure.in
+++ b/c/src/exec/score/cpu/i960/configure.in
@@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/m68k/configure.in
+++ b/c/src/exec/score/cpu/m68k/configure.in
@@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/mips/configure.in
+++ b/c/src/exec/score/cpu/mips/configure.in
@@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/mips64orion/configure.in
+++ b/c/src/exec/score/cpu/mips64orion/configure.in
@@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/no_cpu/configure.in
+++ b/c/src/exec/score/cpu/no_cpu/configure.in
@@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/powerpc/configure.in
+++ b/c/src/exec/score/cpu/powerpc/configure.in
@@ -31,9 +31,6 @@ RTEMS_CHECK_NEWLIB
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 AM_CONDITIONAL(PPC_NEW_EXCEPTION_PROCESSING,test "$RTEMS_CPU_MODEL" = "mpc750" -o "$RTEMS_CPU_MODEL" = "mpc604")

 # Try to explicitly list a Makefile here 
--- a/c/src/exec/score/cpu/sh/configure.in
+++ b/c/src/exec/score/cpu/sh/configure.in
@@ -31,9 +31,6 @@ RTEMS_CHECK_NEWLIB
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/sparc/configure.in
+++ b/c/src/exec/score/cpu/sparc/configure.in
@@ -30,9 +30,6 @@ RTEMS_CHECK_NEWLIB
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- a/c/src/exec/score/cpu/unix/configure.in
+++ b/c/src/exec/score/cpu/unix/configure.in
@@ -37,9 +37,6 @@ if test "$HAS_MP" = "yes"; then
  RTEMS_CHECK_SYSV_UNIX
 fi

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
--- 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
--- 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)
--- 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
--- 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)
--- 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
+H_FILES = bsp.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
--- a/c/src/lib/libbsp/bare/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/bare/wrapup/Makefile.in
@@ -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
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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);
--- 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

--- 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
--- 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
--- a/c/src/librpc/configure.in
+++ b/c/src/librpc/configure.in
@@ -29,9 +29,6 @@ RTEMS_CHECK_NETWORKING(RTEMS_BSP)

 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 RTEMS_PROJECT_ROOT

 # try to explicitly list a Makefile here 
--- a/c/src/librtems++/configure.in
+++ b/c/src/librtems++/configure.in
@@ -29,9 +29,6 @@ RTEMS_CANONICALIZE_TOOLS

 AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes")

-PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
-AC_SUBST(PROJECT_INCLUDE)
-
 RTEMS_PROJECT_ROOT

 AC_OUTPUT( 
--- a/make/custom/dmv152.cfg
+++ b/make/custom/dmv152.cfg
@@ -67,11 +67,11 @@ define make-exe
 endef
 else
 define make-exe
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $(basename $@).nxe \
+	$(LINK.c) $(LDLIBS) -o $(basename $@).nxe \
 	    $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).i
 	$(SED) -e 's/.$$//' -e '/^S0/d' $(basename $@).i | \
-	    $(PACKHEX) > $(basename $@).exe
+	    $(PACKHEX) > $@
 	$(NM) -g -n $(basename $@).nxe > $(basename $@).num
 	$(SIZE) $(basename $@).nxe
 endef
--- a/make/custom/gensh2.cfg
+++ b/make/custom/gensh2.cfg
@@ -83,7 +83,7 @@ else
 define make-exe
 	$(LINK.c) -Wl,-Map,$(basename $@).map \
 	    $(LDLIBS) -o $@ \
-	    $(LINK_OBJS) -lstdc++ $(LINK_LIBS)
+	    $(LINK_OBJS) $(LINK_LIBS) -lstdc++
 	$(NM) -n $@ > $(basename $@).num
 	$(SIZE) $@
 endef
--- a/scripts-ada/Makefile.am
+++ b/scripts-ada/Makefile.am
@@ -1,3 +1,7 @@
+##
+## $Id$
+##
+
 AUTOMAKE_OPTIONS = foreign

 SUBDIRS = . binutils gnatnewlib gdb
--- a/scripts-ada/binutils/Makefile.am
+++ b/scripts-ada/binutils/Makefile.am
@@ -1,4 +1,6 @@
+##
 ## $Id$
+##

 AUTOMAKE_OPTIONS = foreign

--- a/scripts-ada/gdb/Makefile.am
+++ b/scripts-ada/gdb/Makefile.am
@@ -1,3 +1,7 @@
+##
+## $Id$
+##
+
 AUTOMAKE_OPTIONS = foreign

 MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,3 +1,7 @@
+##
+## $Id$
+##
+
 AUTOMAKE_OPTIONS = foreign

 SUBDIRS = . binutils gccnewlib gdb rtems
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -1,4 +1,6 @@
+##
 ## $Id$
+##

 AUTOMAKE_OPTIONS = foreign

--- a/scripts/gccnewlib/Makefile.am
+++ b/scripts/gccnewlib/Makefile.am
@@ -1,4 +1,6 @@
+##
 ## $Id$
+##

 AUTOMAKE_OPTIONS = foreign

--- a/scripts/gccnewlib/gccnewlib.spec.in
+++ b/scripts/gccnewlib/gccnewlib.spec.in
@@ -1,7 +1,7 @@
 #
 # spec file for building gcc for rtems
 # 
-# Copyright  (c)  1999  OARCorp, Huntsville, AL
+# Copyright  (c) 1999,2000 OARCorp, Huntsville, AL
 #
 # please send bugfixes or comments to joel@OARcorp.com
 #
@@ -14,8 +14,11 @@ Group:	      rtems
 Release:      @Release@
 Copyright:    1999 OARCorp

-Provides:     	rtems-base-gcc @target_alias@-gcc @target_alias@-chill
-Provides:	@target_alias@-gcj @target_alias@-g77 @target_alias@-objc
+Provides:     	rtems-base-gcc @target_alias@-gcc 
+Provides:	rtems-base-chill @target_alias@-chill
+Provides:	rtems-base-gcj @target_alias@-gcj 
+Provides:	rtems-base-g77 @target_alias@-g77
+Provides:	@target_alias@-objc
 Requires:     	@target_alias@-binutils

 Autoreqprov:  	on
@@ -53,69 +56,9 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 the more than 10 targets it is possible to build.

 You can get them yourself from the Internet and copy them to
- your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR).
+ your /usr/src/[redhat|packages]/SOURCES directory ($RPM_SOURCE_DIR).
 Or you can try the ftp options of rpm :-)

-%package -n rtems-base-gcc
-Summary:      base package for rtems gcc and newlib C Library 
-Group: rtems
-
-%description -n rtems-base-gcc
-
-RTEMS is an open source operating system for embedded systems.
-
-This is the files for gcc and newlib that are shared by all targets.
-
-%package -n @target_alias@-gcc
-Summary:      rtems gcc and newlib C Library for @target_alias@
-Group: rtems
-Requires: @target_alias@-binutils rtems-base-gcc
-
-%description -n @target_alias@-gcc
-RTEMS is an open source operating system for embedded systems.
-
-This is gcc and newlib C Library for @target_alias@.
-
-%package -n @target_alias@-chill
-Summary:      gcc/chill compiler for @target_alias@
-Group: rtems
-Requires: @target_alias@-gcc
-
-%description -n @target_alias@-chill
-RTEMS is an open source operating system for embedded systems.
-
-This is the gcc/chill compiler and support files for @target_alias@
-
-%package -n @target_alias@-gcj
-Summary:      gcc/java compiler (gcj) for @target_alias@
-Group: rtems
-Requires: @target_alias@-gcc
-
-%description -n @target_alias@-gcj
-RTEMS is an open source operating system for embedded systems.
-
-This is the gcc/java compiler for @target_alias@
-
-%package -n @target_alias@-g77
-Summary:      gcc/g77 compiler for @target_alias@
-Group: rtems
-Requires: @target_alias@-gcc
-
-%description -n @target_alias@-g77
-RTEMS is an open source operating system for embedded systems.
-
-This is the gcc/g77 compiler for @target_alias@
-
-%package -n @target_alias@-objc
-Summary:      gcc/objc compiler for @target_alias@
-Group: rtems
-Requires: @target_alias@-objc
-
-%description -n @target_alias@-objc
-RTEMS is an open source operating system for embedded systems.
-
-This is the gcc/objc compiler for @target_alias@
-
 %prep
 # untar the sources inside @target_alias@-gcc-newlib
 %setup -c -n @target_alias@-gcc-newlib -a 0 -a 1
@@ -198,13 +141,25 @@ This is the gcc/objc compiler for @target_alias@
    esac
  done

+# ==============================================================
+# rtems-base-gcc
+# ==============================================================
+%package -n rtems-base-gcc
+Summary:      base package for rtems gcc and newlib C Library 
+Group: rtems
+
+%description -n rtems-base-gcc
+
+RTEMS is an open source operating system for embedded systems.
+
+This is the files for gcc and newlib that are shared by all targets.
+
 %files -n rtems-base-gcc
 %dir /opt/rtems/info
-# %doc /opt/rtems/info/dir
-%doc /opt/rtems/info/cpp.info*
-%doc /opt/rtems/info/gcc.info*
-%doc /opt/rtems/info/libc.info*
-%doc /opt/rtems/info/libm.info*
+%doc /opt/rtems/info/cpp.info*.gz
+%doc /opt/rtems/info/gcc.info*.gz
+%doc /opt/rtems/info/libc.info*.gz
+%doc /opt/rtems/info/libm.info*.gz

 %dir /opt/rtems/bin
 /opt/rtems/bin/cpp@exe_ext@
@@ -217,8 +172,40 @@ This is the gcc/objc compiler for @target_alias@
 %dir /opt/rtems/include
 /opt/rtems/include/g++-3

-%files -n @target_alias@-gcc -f build/files.gcc
+%post -n rtems-base-gcc
+  if test -d $RPM_INSTALL_PREFIX/rtems/info; 
+  then
+    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
+    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
+    test -n "$f" && for i in $f; do
+      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
+    done
+  fi

+%postun -n rtems-base-gcc
+  if test -d $RPM_INSTALL_PREFIX/rtems/info; 
+  then
+    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
+    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
+    test -n "$f" && for i in $f; do
+      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
+    done
+  fi
+
+# ==============================================================
+# @target_alias@-gcc
+# ==============================================================
+%package -n @target_alias@-gcc
+Summary:      rtems gcc and newlib C Library for @target_alias@
+Group: rtems
+Requires: @target_alias@-binutils rtems-base-gcc
+
+%description -n @target_alias@-gcc
+RTEMS is an open source operating system for embedded systems.
+
+This is gcc and newlib C Library for @target_alias@.
+
+%files -n @target_alias@-gcc -f build/files.gcc
 %doc /opt/rtems/man/man1/@target_alias@-gcc.1
 %doc /opt/rtems/man/man1/@target_alias@-g++.1

@@ -232,7 +219,24 @@ This is the gcc/objc compiler for @target_alias@

 /opt/rtems/@target_alias@

-%post -n @target_alias@-gcc
+# ==============================================================
+# rtems-base-chill
+# ==============================================================
+%package -n rtems-base-chill
+Summary:      base package for rtems gcc/chill compiler.
+Group: rtems
+Requires: rtems-base-gcc
+
+%description -n rtems-base-chill
+RTEMS is an open source operating system for embedded systems.
+
+This is the files for gcc/chill that are shared by all targets.
+
+%files -n rtems-base-chill
+%dir /opt/rtems/info
+%doc /opt/rtems/info/chill.info*.gz
+
+%post -n rtems-base-chill
  if test -d $RPM_INSTALL_PREFIX/rtems/info; 
  then
    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
@@ -242,7 +246,7 @@ This is the gcc/objc compiler for @target_alias@
    done
  fi

-%postun -n @target_alias@-gcc
+%postun -n rtems-base-chill
  if test -d $RPM_INSTALL_PREFIX/rtems/info; 
  then
    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
@@ -252,80 +256,134 @@ This is the gcc/objc compiler for @target_alias@
    done
  fi

+# ==============================================================
+# @target_alias@-chill
+# ==============================================================
+%package -n @target_alias@-chill
+Summary:      gcc/chill compiler for @target_alias@
+Group: rtems
+Requires: rtems-base-chill @target_alias@-gcc
+
+%description -n @target_alias@-chill
+RTEMS is an open source operating system for embedded systems.
+
+This is the gcc/chill compiler and support files for @target_alias@

 %files -n @target_alias@-chill -f build/files.chill
 %dir /opt/rtems/bin
 /opt/rtems/bin/@target_alias@-chill

-%dir /opt/rtems/info
-%doc /opt/rtems/info/dir
-%doc /opt/rtems/info/chill.info*
+# ==============================================================
+# rtems-base-gcj
+# ==============================================================
+%package -n rtems-base-gcj
+Summary:      base package for rtems gcc/java compiler (gcj).
+Group: rtems
+Requires: rtems-base-gcc

-%post -n @target_alias@-chill
-  if test -d $RPM_INSTALL_PREFIX/rtems/info; 
-  then
-    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
-    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
-    done
-  fi
+%description -n rtems-base-gcj
+RTEMS is an open source operating system for embedded systems.

-%postun -n @target_alias@-chill
-  if test -d $RPM_INSTALL_PREFIX/rtems/info; 
-  then
-    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
-    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
-    done
-  fi
+This is the files for gcc/java (gcj) that are shared by all targets.

-
-%files -n @target_alias@-gcj -f build/files.gcj
+%files -n rtems-base-gcj
 %dir /opt/rtems/bin
 /opt/rtems/bin/jcf-dump@exe_ext@
 /opt/rtems/bin/jv-scan@exe_ext@
 /opt/rtems/bin/gcjh@exe_ext@
+
+# ==============================================================
+# @target_alias@-gcj
+# ==============================================================
+%package -n @target_alias@-gcj
+Summary:      gcc/java compiler (gcj) for @target_alias@
+Group: rtems
+Requires: rtems-base-gcj @target_alias@-gcc
+
+%description -n @target_alias@-gcj
+RTEMS is an open source operating system for embedded systems.
+
+This is the gcc/java compiler for @target_alias@
+
+%files -n @target_alias@-gcj -f build/files.gcj
+%dir /opt/rtems/bin
 /opt/rtems/bin/@target_alias@-gcj@exe_ext@

 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jc1
 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain

+# ==============================================================
+# rtems-base-g77
+# ==============================================================
+%package -n rtems-base-g77
+Summary:      rtems base package for gcc/g77 compiler
+Group: rtems
+Requires: rtems-base-gcc

-%files -n @target_alias@-g77 -f build/files.g77
-%dir /opt/rtems/bin
-/opt/rtems/bin/@target_alias@-g77@exe_ext@
+%description -n rtems-base-g77
+RTEMS is an open source operating system for embedded systems.

+This is the files for gcc/g77 that are shared by all targets.
+
+%files -n rtems-base-g77
 %dir /opt/rtems/info
-%doc /opt/rtems/info/g77.info*
+%doc /opt/rtems/info/g77.info*.gz

 %dir /opt/rtems/man
 %dir /opt/rtems/man/man1
 %doc /opt/rtems/man/man1/@target_alias@-g77.1

+%post -n rtems-base-g77
+  if test -d $RPM_INSTALL_PREFIX/rtems/info; 
+  then
+    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
+    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
+    test -n "$f" && for i in $f; do
+      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
+    done
+  fi
+
+%postun -n rtems-base-g77
+  if test -d $RPM_INSTALL_PREFIX/rtems/info; 
+  then
+    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
+    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
+    test -n "$f" && for i in $f; do
+      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
+    done
+  fi
+
+# ==============================================================
+# @target_alias@-g77
+# ==============================================================
+%package -n @target_alias@-g77
+Summary:      gcc/g77 compiler for @target_alias@
+Group: rtems
+Requires: rtems-base-g77 @target_alias@-gcc
+
+%description -n @target_alias@-g77
+RTEMS is an open source operating system for embedded systems.
+
+This is the gcc/g77 compiler for @target_alias@
+
+%files -n @target_alias@-g77 -f build/files.g77
+%dir /opt/rtems/bin
+/opt/rtems/bin/@target_alias@-g77@exe_ext@
+
 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@

-%post -n @target_alias@-g77
-  if test -d $RPM_INSTALL_PREFIX/rtems/info; 
-  then
-    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
-    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
-    done
-  fi
+# ==============================================================
+# @target_alias@-objc
+# ==============================================================
+%package -n @target_alias@-objc
+Summary:      gcc/objc compiler for @target_alias@
+Group: rtems
+Requires: @target_alias@-gcc

-%postun -n @target_alias@-g77
-  if test -d $RPM_INSTALL_PREFIX/rtems/info; 
-  then
-    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
-    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
-    done
-  fi
+%description -n @target_alias@-objc
+RTEMS is an open source operating system for embedded systems.

+This is the gcc/objc compiler for @target_alias@

 %files -n @target_alias@-objc -f build/files.objc
 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj@exe_ext@
--- a/scripts/gdb/Makefile.am
+++ b/scripts/gdb/Makefile.am
@@ -1,3 +1,7 @@
+##
+## $Id$
+##
+
 AUTOMAKE_OPTIONS = foreign

 MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec
--- a/scripts/rtems/Makefile.am
+++ b/scripts/rtems/Makefile.am
@@ -1,3 +1,7 @@
+##
+## $Id$
+##
+
 AUTOMAKE_OPTIONS = foreign

 MKBSPSPEC = $(SHELL) $(top_builddir)/mkbspspec