1 files changed, 26 insertions, 29 deletions
diff --git a/c/src/exec/score/src/Makefile.in b/c/src/exec/score/src/Makefile.in
index fb238d0855..e7028aa3d6 100644
--- a/c/src/exec/score/src/Makefile.in
+++ b/c/src/exec/score/src/Makefile.in
@@ -5,51 +5,48 @@
 @SET_MAKE@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ../../../../..
-subdir = c/src/exec/score/src
+top_builddir = ../..
+subdir = score/src
 
-INSTALL = @INSTALL@
-
-RTEMS_ROOT = $(top_srcdir)/@RTEMS_TOPdir@
+RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
 # We only build multiprocessing related files if HAS_MP was defined
-MP_PIECES_yes_V = mpci objectmp threadmp
-MP_PIECES = $(MP_PIECES_$(HAS_MP)_V)
+MP_C_PIECES_yes_V = mpci objectmp threadmp
+MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V)
 
-THREAD_PIECES=\
-    thread threadchangepriority threadclearstate threadclose \
-    threadcreateidle threaddelayended threaddispatch \
-    threadevaluatemode threadget threadhandler \
-    threadidlebody threadinitialize threadloadenv \
-    threadready threadresettimeslice threadrestart \
-    threadsetpriority threadsetstate threadsettransient \
-    threadstackallocate threadstackfree threadstart \
-    threadstartmultitasking threadtickletimeslice \
+THREAD_C_PIECES = thread threadchangepriority threadclearstate threadclose \
+    threadcreateidle threaddelayended threaddispatch threadevaluatemode \
+    threadget threadhandler threadidlebody threadinitialize threadloadenv \
+    threadready threadresettimeslice threadrestart threadsetpriority \
+    threadsetstate threadsettransient threadstackallocate threadstackfree \
+    threadstart threadstartmultitasking threadtickletimeslice \
     threadyieldprocessor
 
 # C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES=apiext chain coremsg coremutex coresem coretod heap interr \
-    isr object $(THREAD_PIECES) threadq userext \
-    watchdog wkspace $(MP_PIECES)
-C_FILES=$(C_PIECES:%=%.c)
-C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
+C_PIECES = apiext chain coremsg coremutex coresem coretod heap interr isr \
+    object $(THREAD_C_PIECES) threadq userext watchdog wkspace \
+    $(MP_C_PIECES)
+C_FILES = $(C_PIECES:%=%.c)
+C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-SRCS=$(C_FILES)
-OBJS=$(C_O_FILES)
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
 #
 # Add local stuff here using +=
 #
 
-DEFINES  += -D__RTEMS_INSIDE__
+DEFINES += -D__RTEMS_INSIDE__
 CPPFLAGS +=
-CFLAGS   += $(CFLAGS_OS_V)
+CFLAGS += $(CFLAGS_OS_V)
 
 #
 # Add your list of files to delete here.  The config files
@@ -58,11 +55,11 @@ CFLAGS   += $(CFLAGS_OS_V)
 #  'make clobber' already includes 'make clean'
 #
 
-CLEAN_ADDITIONS += 
+CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-all:	${ARCH} $(SRCS) ${OBJS}
+all: ${ARCH} $(SRCS) ${OBJS}
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status