10 files changed, 118 insertions, 33 deletions
diff --git a/c/src/lib/libbsp/hppa1.1/Makefile.in b/c/src/lib/libbsp/hppa1.1/Makefile.in
index f786f6bff0..2c549d1c21 100644
--- a/c/src/lib/libbsp/hppa1.1/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/Makefile.in
@@ -4,14 +4,23 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../..
+subdir = c/src/lib/libbsp/hppa1.1
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 # Descend into the $(RTEMS_BSP_FAMILY) directory
 SUB_DIRS=$(RTEMS_BSP_FAMILY)
+
+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/pxfl/Makefile.in b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in
index ef7275eeaa..5a5a1eb84a 100644
--- a/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in
@@ -10,12 +10,17 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../../..
+subdir = c/src/lib/libbsp/hppa1.1/pxfl
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
@@ -28,7 +33,6 @@ ifeq (k, $(findstring k, $(MAKEFLAGS)))
 EXIT_CMD=true
 endif
 
-
 all install::
 	@$(ECHO); $(ECHO)
 	@if [ ! -d $(FLOSS_ROOT) ]; \
@@ -50,3 +54,7 @@ all install::
 	fi
 	@$(ECHO); $(ECHO)
 	$(INSTALL_CHANGE) -m 444 $(srcdir)/floss-bsp.h $(PROJECT_INCLUDE)/bsp.h
+
+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/simhppa/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in
index 7d2c8b92db..ffa748251d 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in
@@ -4,12 +4,17 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../../..
+subdir = c/src/lib/libbsp/hppa1.1/simhppa
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
@@ -21,3 +26,7 @@ MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
 #  from the individual .rel files built in other directories
 # NOTE: we pick up HPPA clock and timer from libcpu/hppa
 SUB_DIRS=tools include start startup tty $(MP_SUPPORT) wrapup
+
+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/simhppa/include/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in
index 0d336f9700..4853aaac35 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/include/Makefile.in
@@ -4,19 +4,23 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../../../..
+subdir = c/src/lib/libbsp/hppa1.1/simhppa/include
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 H_PIECES = bsp coverhd
 H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
 
 RTEMS_H_PIECES = ttydrv
 RTEMS_H_FILES=$(RTEMS_H_PIECES:%=$(srcdir)/%.h)
 
-
 #
 #  Equate files are for including from assembly preprocessed by
 #  gm4 or gasp.  No examples are provided except for those for
@@ -41,3 +45,7 @@ CLOBBER_ADDITIONS +=
 all:	$(SRCS)
 	$(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE)
 	$(INSTALL_CHANGE) -m 444 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems
+
+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/simhppa/shmsupp/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in
index af5d63c8f6..a080b32935 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/shmsupp/Makefile.in
@@ -4,12 +4,17 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../../../..
+subdir = c/src/lib/libbsp/hppa1.1/simhppa/shmsupp
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 PGM=${ARCH}/shmsupp.rel
 
 # C source names, if any, go here -- minus the .c
@@ -55,3 +60,6 @@ all:	${ARCH} $(SRCS) $(PGM)
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install:  all
 
+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/simhppa/start/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in
index 7e3a876cf2..3fc9d8337f 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/start/Makefile.in
@@ -4,12 +4,17 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../../../..
+subdir = c/src/lib/libbsp/hppa1.1/simhppa/start
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 PGMS=${ARCH}/start.o
 
 # C source names, if any, go here -- minus the .c
@@ -54,3 +59,7 @@ CLOBBER_ADDITIONS +=
 
 all:	${ARCH} $(SRCS) $(OBJS) $(PGM)
 	$(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib
+
+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/simhppa/startup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in
index 7cd334ee3e..cf34eaf5b9 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/startup/Makefile.in
@@ -4,12 +4,17 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@:@srcdir@/../../../shared
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../../../..
+subdir = c/src/lib/libbsp/hppa1.1/simhppa/startup
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@:@srcdir@/../../../shared
+
 PGM=${ARCH}/startup.rel
 
 # C source names, if any, go here -- minus the .c
@@ -53,3 +58,7 @@ ${PGM}: ${SRCS} ${OBJS}
 all:	${ARCH} $(SRCS) $(PGM)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
+
+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/simhppa/tools/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in
index 9ae6a82538..b12d6d6e2b 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/tools/Makefile.in
@@ -4,12 +4,17 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../../../..
+subdir = c/src/lib/libbsp/hppa1.1/simhppa/tools
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 # we use host compiler here for genoffsets.  Hopefully it has same alignment!!
 USE_HOST_COMPILER=yes
 
@@ -52,3 +57,7 @@ all:	${ARCH} $(SRCS) $(PGMS)
 
 # Install the program(s), appending _g or _p as appropriate.
 # for include files, just use $(INSTALL_CHANGE)
+
+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/simhppa/tty/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in
index 2c00c52894..8229287c33 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/tty/Makefile.in
@@ -4,12 +4,17 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../../../..
+subdir = c/src/lib/libbsp/hppa1.1/simhppa/tty
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 PGM=${ARCH}/tty.rel
 
 # C source names, if any, go here -- minus the .c
@@ -55,3 +60,6 @@ all:	${ARCH} $(SRCS) $(PGM)
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install:  all
 
+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/simhppa/wrapup/Makefile.in b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in
index 04790f21f2..f0c42af3f8 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in
@@ -4,12 +4,17 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../../../..
+subdir = c/src/lib/libbsp/hppa1.1/simhppa/wrapup
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 BSP_PIECES=startup tty
 # pieces to pick up out of libcpu/hppa
 CPU_PIECES=clock milli timer
@@ -59,8 +64,11 @@ $(LIB): ${OBJS}
 all:	${ARCH} $(SRCS) $(LIB)
 	$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib
 
-
 $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs: ../bsp_specs
 	$(INSTALL_DATA) $< $@
 
 preinstall: $(PROJECT_ROOT)/${RTEMS_BSP}/lib/bsp_specs
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status