Cosmetics.

9 files changed, 34 insertions, 31 deletions

diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am
index a71f02ce50..566266fcdc 100644
--- a/c/src/lib/libbsp/i386/i386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/i386ex/Makefile.am
@@ -69,8 +69,8 @@ libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
 if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
-libbsp_a_LIBADD += ../../../libcpu/i386/cache.rel \
-    ../../../libcpu/i386/score.rel
+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \
+    ../../../libcpu/@RTEMS_CPU@/score.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 81568a1847..a1c5cc869a 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -141,8 +141,9 @@ libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel ide.rel \
 if HAS_NETWORKING
 libbsp_a_LIBADD += ne2000.rel wd8003.rel 3c509.rel
 endif
-libbsp_a_LIBADD += ../../../libcpu/i386/cache.rel \
-    ../../../libcpu/i386/page.rel ../../../libcpu/i386/score.rel
+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \
+    ../../../libcpu/@RTEMS_CPU@/page.rel \
+    ../../../libcpu/@RTEMS_CPU@/score.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
index 6f4dfb8e1b..390b57f406 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
@@ -78,8 +78,8 @@ libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
 if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
-libbsp_a_LIBADD += ../../../libcpu/i386/cache.rel \
-    ../../../libcpu/i386/score.rel
+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \
+    ../../../libcpu/@RTEMS_CPU@/score.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/mips/genmongoosev/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am
index 5a0d269178..c4585ce7c3 100644
--- a/c/src/lib/libbsp/mips/genmongoosev/Makefile.am
+++ b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am
@@ -59,10 +59,10 @@ timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
-libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache.rel \
-    ../../../libcpu/mips/shared/interrupts.rel \
-    ../../../libcpu/mips/mongoosev/duart.rel \
-    ../../../libcpu/mips/mongoosev/vectorisrs.rel
+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \
+    ../../../libcpu/@RTEMS_CPU@/mongoosev/duart.rel \
+    ../../../libcpu/@RTEMS_CPU@/mongoosev/vectorisrs.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index ffbab050e3..ccacd429fd 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -56,9 +56,9 @@ timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
-libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache.rel \
-    ../../../libcpu/mips/shared/interrupts.rel \
-    ../../../libcpu/mips/tx39/vectorisrs.rel
+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \
+    ../../../libcpu/@RTEMS_CPU@/tx39/vectorisrs.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/mips/p4000/Makefile.am b/c/src/lib/libbsp/mips/p4000/Makefile.am
index f9fd90496c..d8bb0e92a1 100644
--- a/c/src/lib/libbsp/mips/p4000/Makefile.am
+++ b/c/src/lib/libbsp/mips/p4000/Makefile.am
@@ -48,11 +48,11 @@ liblnk_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 noinst_LIBRARIES = libbsp.a
 libbsp_a_SOURCES =
 libbsp_a_LIBADD = startup.rel console.rel liblnk.rel
-libbsp_a_LIBADD += ../../../libcpu/mips/shared/cache.rel \
-    ../../../libcpu/mips/shared/interrupts.rel \
-    ../../../libcpu/mips/r46xx/clock.rel \
-    ../../../libcpu/mips/r46xx/timer.rel \
-    ../../../libcpu/mips/r46xx/vectorisrs.rel
+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel \
+    ../../../libcpu/@RTEMS_CPU@/r46xx/clock.rel \
+    ../../../libcpu/@RTEMS_CPU@/r46xx/timer.rel \
+    ../../../libcpu/@RTEMS_CPU@/r46xx/vectorisrs.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
index f77067296a..399af77589 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
@@ -78,15 +78,15 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
 
-libbsp_a_LIBADD += ../../../libcpu/powerpc/shared/cpuIdent.rel \
-    ../../../libcpu/powerpc/shared/cache.rel \
-    ../../../libcpu/powerpc/@exceptions@/rtems-cpu.rel \
-    ../../../libcpu/powerpc/mpc8xx/clock.rel \
-    ../../../libcpu/powerpc/mpc8xx/console-generic.rel \
-    ../../../libcpu/powerpc/mpc8xx/cpm.rel \
-    ../../../libcpu/powerpc/mpc8xx/mmu.rel \
-    ../../../libcpu/powerpc/mpc8xx/timer.rel \
-    ../../../libcpu/powerpc/mpc8xx/exceptions.rel
+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
+    ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
+    ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
+    ../../../libcpu/@RTEMS_CPU@/mpc8xx/clock.rel \
+    ../../../libcpu/@RTEMS_CPU@/mpc8xx/console-generic.rel \
+    ../../../libcpu/@RTEMS_CPU@/mpc8xx/cpm.rel \
+    ../../../libcpu/@RTEMS_CPU@/mpc8xx/mmu.rel \
+    ../../../libcpu/@RTEMS_CPU@/mpc8xx/timer.rel \
+    ../../../libcpu/@RTEMS_CPU@/mpc8xx/exceptions.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index 07c5f8f7ce..7cde429d9b 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -73,8 +73,9 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += erc32sonic.rel
 endif
 
-libbsp_a_LIBADD += ../../../libcpu/sparc/cache.rel \
-    ../../../libcpu/sparc/reg_win.rel ../../../libcpu/sparc/syscall.rel
+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \
+    ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
+    ../../../libcpu/@RTEMS_CPU@/syscall.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/sparc/leon/Makefile.am b/c/src/lib/libbsp/sparc/leon/Makefile.am
index 355b6da9df..af5c0481a7 100644
--- a/c/src/lib/libbsp/sparc/leon/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/Makefile.am
@@ -77,8 +77,9 @@ if HAS_NETWORKING
 libbsp_a_LIBADD += leon_open_eth.rel
 endif
 
-libbsp_a_LIBADD += ../../../libcpu/sparc/cache.rel \
-    ../../../libcpu/sparc/reg_win.rel ../../../libcpu/sparc/syscall.rel
+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \
+    ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
+    ../../../libcpu/@RTEMS_CPU@/syscall.rel
 
 all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)