4 files changed, 48 insertions, 13 deletions
diff --git a/tools/cpu/Makefile.in b/tools/cpu/Makefile.in
index 72d96812df..c8d387af9f 100644
--- a/tools/cpu/Makefile.in
+++ b/tools/cpu/Makefile.in
@@ -4,13 +4,22 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../..
+subdir = c/src/exec/score/tools
 
 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
 
 SUB_DIRS=generic $(wildcard $(RTEMS_CPU))
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/tools/cpu/generic/Makefile.in b/tools/cpu/generic/Makefile.in
index d81dfe5ffa..9710c36d06 100644
--- a/tools/cpu/generic/Makefile.in
+++ b/tools/cpu/generic/Makefile.in
@@ -8,15 +8,19 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../../..
+subdir = c/src/exec/score/tools/generic
 
 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
-include $(RTEMS_ROOT)/make/rtems.cfg
 
 DESTDIR=$(PROJECT_RELEASE)/bin
 
@@ -36,3 +40,7 @@ $(INSTALLED_PGMS): $(PGMS)
 	$(INSTALL) $(INSTBINFLAGS) $^ $@
 
 install:  $(DESTDIR) $(INSTALLED_PGMS)
+
+%: $(srcdir)/%.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/tools/cpu/sh/Makefile.in b/tools/cpu/sh/Makefile.in
index 75537ef4ca..93fe29cfcf 100644
--- a/tools/cpu/sh/Makefile.in
+++ b/tools/cpu/sh/Makefile.in
@@ -6,12 +6,17 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-VPATH = @srcdir@
-RTEMS_ROOT = @top_srcdir@
-PROJECT_ROOT = @PROJECT_ROOT@
+top_srcdir = @top_srcdir@
+top_builddir = ../../../../../..
+subdir = c/src/exec/score/tools/sh
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 # we use the host compiler here 
 USE_HOST_COMPILER=yes
 
@@ -62,3 +67,7 @@ $(DESTDIR):
 # Install the program
 install:  $(DESTDIR) $(PGMS)
 	$(INSTALL) $(INSTBINFLAGS) ${PGMS} $(DESTDIR)
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/tools/cpu/unix/Makefile.in b/tools/cpu/unix/Makefile.in
index 75320594ea..e1098093b0 100644
--- a/tools/cpu/unix/Makefile.in
+++ b/tools/cpu/unix/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/exec/score/tools/unix
 
 INSTALL = @INSTALL@
 
+RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+PROJECT_ROOT = @PROJECT_ROOT@
+
+VPATH = @srcdir@
+
 # we use host compiler here for gensize.  Hopefully it has same alignment!!
 USE_HOST_COMPILER=yes
 
@@ -58,3 +63,7 @@ preinstall: ${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