Applied patch rtems-rc-19990820-6.diff.gz from

Ralf Corsepius <corsepiu@faw.uni-ulm.de> which converted many
Makefile.in's to Makefile.am's.  This added a lot of files.

c/src/lib/libbsp/Makefile.am.new

@@ -0,0 +1,32 @@
+#
+#  $Id$
+#
+
+AUTOMAKE_OPTIONS = foreign 1.4
+ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
+
+TMPINSTALL_FILES = \
+$(PROJECT_ROOT)/@RTEMS_BSP@/lib \
+$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs
+
+$(PROJECT_ROOT)/@RTEMS_BSP@/lib:
+	@$(mkinstalldirs) $@
+$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: $(srcdir)/@RTEMS_BSP_SPECS@
+	$(INSTALL_DATA) $< $@
+
+# shmdr is a portable shared memory MPCI layer
+# We only build it if HAS_MP was defined
+if HAS_MP
+MP_DRIVERS = shmdr
+endif
+
+# If we are building a "real" BSP, then we need to descend into the
+# appropriate CPU specific directory.  The bare BSP is a special
+# case which can be built for any CPU and it resides at the same
+# level as the CPUs.  If we are building the bare BSP, then descend
+# into that directory.
+
+SUBDIRS = $(MP_DRIVERS) @RTEMS_LIBBSP_CPU_SUBDIR@
+
+include $(top_srcdir)/../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../automake/local.am

c/src/lib/libbsp/Makefile.in

@@ -5,8 +5,7 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = libbsp
+top_builddir = .
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
@@ -26,8 +25,7 @@ $(INSTALLDIRS):
 
 # shmdr is a portable shared memory MPCI layer
 # We only build it if HAS_MP was defined
-MP_DRIVERS_yes_V = shmdr
-MP_DRIVERS = $(MP_DRIVERS_$(HAS_MP)_V)
+@HAS_MP_TRUE@MP_DRIVERS = shmdr
 
 SUB_DIRS = $(MP_DRIVERS)
 
@@ -53,4 +51,4 @@ preinstall:
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	 && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status

c/src/lib/libbsp/a29k/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = libbsp/a29k
+top_builddir = ..
+subdir = a29k
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/a29k/portsw/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/a29k/portsw
+top_builddir = ../..
+subdir = a29k/portsw
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/a29k/portsw/console/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/a29k/portsw/console
+top_builddir = ../../..
+subdir = a29k/portsw/console
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/a29k/portsw/include/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/a29k/portsw/include
+top_builddir = ../../..
+subdir = a29k/portsw/include
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/a29k/portsw/shmsupp/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/a29k/portsw/shmsupp
+top_builddir = ../../..
+subdir = a29k/portsw/shmsupp
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/a29k/portsw/start/Makefile.in

@@ -5,8 +5,7 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = start/a29k
+top_builddir = .
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
@@ -62,4 +61,4 @@ all: ${ARCH} $(SRCS) $(OBJS) $(PGM)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	 && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status

c/src/lib/libbsp/a29k/portsw/startup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/a29k/portsw/startup
+top_builddir = ../../..
+subdir = a29k/portsw/startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/a29k/portsw/wrapup
+top_builddir = ../../..
+subdir = a29k/portsw/wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/bare/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = libbsp/bare
+top_builddir = ..
+subdir = bare
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/bare/include/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/bare/include
+top_builddir = ../..
+subdir = bare/include
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/bare/wrapup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/bare/wrapup
+top_builddir = ../..
+subdir = bare/wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/configure.in

@@ -0,0 +1,100 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl $Id$
+
+AC_PREREQ(2.13)
+AC_INIT(README)
+RTEMS_TOP(../../../..)
+AC_CONFIG_AUX_DIR(../../../..)
+
+RTEMS_CANONICAL_TARGET_CPU
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AM_MAINTAINER_MODE
+
+RTEMS_ENABLE_MULTIPROCESSING
+RTEMS_ENABLE_NETWORKING
+RTEMS_ENABLE_LIBCDIR
+RTEMS_ENABLE_BARE
+
+RTEMS_ENV_RTEMSBSP
+
+RTEMS_CHECK_CPU
+RTEMS_CANONICAL_HOST
+
+RTEMS_PROJECT_ROOT
+
+dnl check target cc
+RTEMS_PROG_CC_FOR_TARGET
+RTEMS_CANONICALIZE_TOOLS
+
+dnl if this is an i386, does gas have good code16 support?
+RTEMS_I386_GAS_CODE16
+AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes");
+
+# find all the Makefiles for the BSPs
+makefiles="$makefiles $RTEMS_CPU/Makefile"
+
+if test "${RTEMS_BSP}" = "bare"; then
+makefiles="$makefiles bare/Makefile"
+fi
+
+RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+RTEMS_CHECK_NETWORKING(RTEMS_BSP)
+
+RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
+
+# Is there code where there should be for this BSP?
+# The bare bsp is a special case as it is not under the RTEMS_CPU path
+case ${RTEMS_BSP} in
+  bare)
+    bspcpudir=
+    if test "X${BARE_CPU_CFLAGS}" = "X" ; then
+      AC_MSG_ERROR([--enable-bare-cpu-cflags not specified for bare bsp])
+    fi
+    if test "X${BARE_CPU_MODEL}" = "X" ; then
+      AC_MSG_ERROR([--enable-bare-cpu-model not specified for bare bsp])
+    fi
+    ;;
+  *)
+    bspcpudir=$RTEMS_CPU/
+    ;;
+esac
+
+if test "$RTEMS_BSP" = "bare" ; then
+  RTEMS_LIBBSP_CPU_SUBDIR="bare"
+else
+  RTEMS_LIBBSP_CPU_SUBDIR='$(RTEMS_CPU)'
+fi
+AC_SUBST(RTEMS_LIBBSP_CPU_SUBDIR)
+     
+if test -d "$srcdir/$bspcpudir$bspdir"; then
+  RTEMS_CHECK_MAKEFILE(${bspcpudir}$bspdir)
+  RTEMS_CHECK_MAKEFILE(${bspcpudir}shared)
+
+  # HACK: sed out bsp-tools from makefiles
+  t="$bspcpudir$bspdir/tools"
+  if test -d "$srcdir/$t"; then
+    bsptools_cfgdirs="$bsptools_cfgdirs $t"
+    makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
+  fi
+else
+  AC_MSG_ERROR([unable to find libbsp subdirectory ($bspdir) for  ${RTEMS_BSP}])
+fi
+
+if test "$HAS_MP" = "yes"; then
+  makefiles="$makefiles shmdr/Makefile"
+else
+  # HACK: sed out shmsupp/Makefile from makefiles
+  t="$bspcpudir$bspdir/shmsupp"
+  makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
+fi
+AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
+
+AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
+
+# try to explicitly list a Makefile here 
+AC_OUTPUT( 
+Makefile
+$makefiles)

c/src/lib/libbsp/hppa1.1/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = libbsp/hppa1.1
+top_builddir = ..
+subdir = hppa1.1
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in

@@ -11,8 +11,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/hppa1.1/pxfl
+top_builddir = ../..
+subdir = hppa1.1/pxfl
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/hppa1.1/simhppa
+top_builddir = ../..
+subdir = hppa1.1/simhppa
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/hppa1.1/simhppa/include
+top_builddir = ../../..
+subdir = hppa1.1/simhppa/include
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/hppa1.1/simhppa/shmsupp
+top_builddir = ../../..
+subdir = hppa1.1/simhppa/shmsupp
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/hppa1.1/simhppa/start
+top_builddir = ../../..
+subdir = hppa1.1/simhppa/start
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/hppa1.1/simhppa/startup
+top_builddir = ../../..
+subdir = hppa1.1/simhppa/startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in

@@ -411,7 +411,7 @@ profile-am:
 profile: profile-am
 .PHONY: profile profile-am
 
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
 preinstall: preinstall-am
 .PHONY: preinstall preinstall-am
 

c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/hppa1.1/simhppa/tty
+top_builddir = ../../..
+subdir = hppa1.1/simhppa/tty
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/hppa1.1/simhppa/wrapup
+top_builddir = ../../..
+subdir = hppa1.1/simhppa/wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = libbsp/i386
+top_builddir = ..
+subdir = i386
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/force386/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/i386/force386
+top_builddir = ../..
+subdir = i386/force386
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/force386/clock/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/force386/clock
+top_builddir = ../../..
+subdir = i386/force386/clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/force386/console/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/force386/console
+top_builddir = ../../..
+subdir = i386/force386/console
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/force386/include/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/force386/include
+top_builddir = ../../..
+subdir = i386/force386/include
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/force386/shmsupp/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/force386/shmsupp
+top_builddir = ../../..
+subdir = i386/force386/shmsupp
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/force386/start/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/force386/start
+top_builddir = ../../..
+subdir = i386/force386/start
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/force386/startup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/force386/startup
+top_builddir = ../../..
+subdir = i386/force386/startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/force386/timer/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/force386/timer
+top_builddir = ../../..
+subdir = i386/force386/timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/force386/wrapup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/force386/wrapup
+top_builddir = ../../..
+subdir = i386/force386/wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/go32/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/i386/go32
+top_builddir = ../..
+subdir = i386/go32
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/go32/clock/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/go32/clock
+top_builddir = ../../..
+subdir = i386/go32/clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/go32/console/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/go32/console
+top_builddir = ../../..
+subdir = i386/go32/console
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/go32/include/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/go32/include
+top_builddir = ../../..
+subdir = i386/go32/include
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/go32/startup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/go32/startup
+top_builddir = ../../..
+subdir = i386/go32/startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/go32/timer/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/go32/timer
+top_builddir = ../../..
+subdir = i386/go32/timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/go32/wrapup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/go32/wrapup
+top_builddir = ../../..
+subdir = i386/go32/wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/i386ex/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/i386/i386ex
+top_builddir = ../..
+subdir = i386/i386ex
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/i386ex/clock/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/i386ex/clock
+top_builddir = ../../..
+subdir = i386/i386ex/clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/i386ex/console/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/i386ex/console
+top_builddir = ../../..
+subdir = i386/i386ex/console
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/i386ex/include/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/i386ex/include
+top_builddir = ../../..
+subdir = i386/i386ex/include
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/i386ex/network/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/i386ex/network
+top_builddir = ../../..
+subdir = i386/i386ex/network
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/i386ex/start/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/i386ex/start
+top_builddir = ../../..
+subdir = i386/i386ex/start
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/i386ex/startup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/i386ex/startup
+top_builddir = ../../..
+subdir = i386/i386ex/startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/i386ex/timer/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/i386ex/timer
+top_builddir = ../../..
+subdir = i386/i386ex/timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/i386ex/wrapup
+top_builddir = ../../..
+subdir = i386/i386ex/wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/3c509/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/pc386/3c509
+top_builddir = ../../..
+subdir = i386/pc386/3c509
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/i386/pc386
+top_builddir = ../..
+subdir = i386/pc386
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/clock/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/pc386/clock
+top_builddir = ../../..
+subdir = i386/pc386/clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/console/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/pc386/console
+top_builddir = ../../..
+subdir = i386/pc386/console
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/dec21140/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/pc386/dec21140
+top_builddir = ../../..
+subdir = i386/pc386/dec21140
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/include/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/pc386/include
+top_builddir = ../../..
+subdir = i386/pc386/include
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/ne2000/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/pc386/ne2000
+top_builddir = ../../..
+subdir = i386/pc386/ne2000
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/start/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/pc386/start
+top_builddir = ../../..
+subdir = i386/pc386/start
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/startup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/pc386/startup
+top_builddir = ../../..
+subdir = i386/pc386/startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/timer/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/pc386/timer
+top_builddir = ../../..
+subdir = i386/pc386/timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/tools/Makefile.in

@@ -381,7 +381,7 @@ profile-am:
 profile: profile-am
 .PHONY: profile profile-am
 
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
 preinstall: preinstall-am
 .PHONY: preinstall preinstall-am
 

c/src/lib/libbsp/i386/pc386/wd8003/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/pc386/wd8003
+top_builddir = ../../..
+subdir = i386/pc386/wd8003
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/pc386/wrapup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/pc386/wrapup
+top_builddir = ../../..
+subdir = i386/pc386/wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/shared/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/i386/shared
+top_builddir = ../..
+subdir = i386/shared
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/shared/comm/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/shared/comm
+top_builddir = ../../..
+subdir = i386/shared/comm
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/shared/io/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/shared/io
+top_builddir = ../../..
+subdir = i386/shared/io
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/shared/irq/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/shared/irq
+top_builddir = ../../..
+subdir = i386/shared/irq
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/shared/pci/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/shared/pci
+top_builddir = ../../..
+subdir = i386/shared/pci
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/ts_386ex/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/i386/ts_386ex
+top_builddir = ../..
+subdir = i386/ts_386ex
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/ts_386ex/clock
+top_builddir = ../../..
+subdir = i386/ts_386ex/clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/ts_386ex/console
+top_builddir = ../../..
+subdir = i386/ts_386ex/console
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/ts_386ex/include/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/ts_386ex/include
+top_builddir = ../../..
+subdir = i386/ts_386ex/include
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/ts_386ex/network/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/ts_386ex/network
+top_builddir = ../../..
+subdir = i386/ts_386ex/network
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/ts_386ex/start
+top_builddir = ../../..
+subdir = i386/ts_386ex/start
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/ts_386ex/startup
+top_builddir = ../../..
+subdir = i386/ts_386ex/startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
@@ -40,7 +40,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 INSTALL_CHANGE = @INSTALL_CHANGE@
 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
 
-INSTALLDIRS = . $(PROJECT_RELEASE)/lib
+INSTALLDIRS = $(PROJECT_RELEASE)/lib
 
 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)

c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/ts_386ex/timer
+top_builddir = ../../..
+subdir = i386/ts_386ex/timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.in

@@ -392,7 +392,7 @@ profile-am:
 profile: profile-am
 .PHONY: profile profile-am
 
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
 preinstall: preinstall-am
 .PHONY: preinstall preinstall-am
 

c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.in

@@ -200,7 +200,7 @@ profile-am:
 profile: profile-am
 .PHONY: profile profile-am
 
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
 preinstall: preinstall-am
 .PHONY: preinstall preinstall-am
 

c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.in

@@ -200,7 +200,7 @@ profile-am:
 profile: profile-am
 .PHONY: profile profile-am
 
-preinstall-am:
+preinstall-am: $(TMPINSTALL_FILES)
 preinstall: preinstall-am
 .PHONY: preinstall preinstall-am
 

c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i386/ts_386ex/wrapup
+top_builddir = ../../..
+subdir = i386/ts_386ex/wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i960/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = libbsp/i960
+top_builddir = ..
+subdir = i960
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i960/cvme961/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/i960/cvme961
+top_builddir = ../..
+subdir = i960/cvme961
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i960/cvme961/clock/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i960/cvme961/clock
+top_builddir = ../../..
+subdir = i960/cvme961/clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i960/cvme961/console/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i960/cvme961/console
+top_builddir = ../../..
+subdir = i960/cvme961/console
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i960/cvme961/include/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i960/cvme961/include
+top_builddir = ../../..
+subdir = i960/cvme961/include
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i960/cvme961/shmsupp/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i960/cvme961/shmsupp
+top_builddir = ../../..
+subdir = i960/cvme961/shmsupp
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i960/cvme961/start/Makefile.in

@@ -5,8 +5,7 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = start/i960
+top_builddir = .
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
@@ -62,4 +61,4 @@ all: ${ARCH} $(SRCS) $(OBJS) $(PGM)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	 && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status

c/src/lib/libbsp/i960/cvme961/startup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i960/cvme961/startup
+top_builddir = ../../..
+subdir = i960/cvme961/startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i960/cvme961/timer/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i960/cvme961/timer
+top_builddir = ../../..
+subdir = i960/cvme961/timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/i960/cvme961/wrapup
+top_builddir = ../../..
+subdir = i960/cvme961/wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/m68k/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = libbsp/m68k
+top_builddir = ..
+subdir = m68k
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/m68k/dmv152/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/m68k/dmv152
+top_builddir = ../..
+subdir = m68k/dmv152
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/m68k/dmv152/clock/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/dmv152/clock
+top_builddir = ../../..
+subdir = m68k/dmv152/clock
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/m68k/dmv152/console/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/dmv152/console
+top_builddir = ../../..
+subdir = m68k/dmv152/console
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/m68k/dmv152/include/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/dmv152/include
+top_builddir = ../../..
+subdir = m68k/dmv152/include
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/dmv152/spurious
+top_builddir = ../../..
+subdir = m68k/dmv152/spurious
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/m68k/dmv152/startup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/dmv152/startup
+top_builddir = ../../..
+subdir = m68k/dmv152/startup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/m68k/dmv152/timer/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/dmv152/timer
+top_builddir = ../../..
+subdir = m68k/dmv152/timer
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = libbsp/m68k/dmv152/wrapup
+top_builddir = ../../..
+subdir = m68k/dmv152/wrapup
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@

c/src/lib/libbsp/m68k/efi332/Makefile.in

@@ -5,8 +5,8 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = libbsp/m68k/efi332
+top_builddir = ../..
+subdir = m68k/efi332
 
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@