[PATCH 08/12] bsps: Avoid source variables in Makefile.am
Sebastian Huber
sebastian.huber at embedded-brains.de
Wed Apr 11 14:07:34 UTC 2018
This patch is a part of the BSP source reorganization.
Update #3285.
---
c/src/lib/libbsp/m32c/m32cbsp/Makefile.am | 32 ++++++-------
c/src/lib/libbsp/powerpc/qemuppc/Makefile.am | 37 +++++++-------
c/src/lib/libbsp/sparc64/niagara/Makefile.am | 63 ++++++++++++------------
c/src/lib/libbsp/sparc64/usiii/Makefile.am | 72 +++++++++++++---------------
4 files changed, 96 insertions(+), 108 deletions(-)
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
index 770c1c9088..a2c433d777 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
+++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
@@ -14,23 +14,23 @@ project_lib_DATA = start.$(OBJEXT)
project_lib_DATA += linkcmds
-startup_SOURCES = ../../shared/bspclean.c \
- ../../shared/bsppredriverhook.c \
- ../../shared/bspgetworkarea.c \
- ../../shared/bspreset.c \
- startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \
- ../../shared/getentropy-cpucounter.c \
- ../../shared/gnatinstallhandler.c startup/crtn.S
-clock_SOURCES = ../../shared/clock_driver_simidle.c
-console_SOURCES = ../../shared/console-polled.c console/console-io.c \
- console/syscalls.S
-timer_SOURCES = timer/timer.c
-
project_lib_LIBRARIES = librtemsbsp.a
-librtemsbsp_a_SOURCES = $(startup_SOURCES)
-librtemsbsp_a_SOURCES += $(clock_SOURCES)
-librtemsbsp_a_SOURCES += $(console_SOURCES)
-librtemsbsp_a_SOURCES += $(timer_SOURCES)
+librtemsbsp_a_SOURCES =
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/crtn.S
+librtemsbsp_a_SOURCES += ../../shared/clock_driver_simidle.c
+librtemsbsp_a_SOURCES += ../../shared/console-polled.c
+librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += console/syscalls.S
+librtemsbsp_a_SOURCES += timer/timer.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index 798da5bc45..c6962c1350 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -18,31 +18,28 @@ project_lib_DATA += rtems_crti.$(OBJEXT)
project_lib_DATA += linkcmds
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
# startup
-startup_SOURCES = ../../shared/bspclean.c \
- ../../shared/bsppredriverhook.c \
- ../../shared/bspgetworkarea.c \
- ../../shared/bspreset.c \
- ../../shared/bootcard.c ../../shared/sbrk.c \
- ../../shared/getentropy-cpucounter.c \
- ../../shared/gnatinstallhandler.c \
- startup/cmain.c startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/cmain.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
# pclock
-# clock_SOURCES = ../../shared/clock_driver_simidle.c
-clock_SOURCES = ../shared/clock/clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/clock.c
# console
-console_SOURCES = ../../shared/console-polled.c console/console-io.c
+librtemsbsp_a_SOURCES += ../../shared/console-polled.c
+librtemsbsp_a_SOURCES += console/console-io.c
# irq
-irq_SOURCES =
-irq_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
-irq_SOURCES += irq/irq_init.c
-
-project_lib_LIBRARIES = librtemsbsp.a
-librtemsbsp_a_SOURCES = $(startup_SOURCES)
-librtemsbsp_a_SOURCES += $(clock_SOURCES)
-librtemsbsp_a_SOURCES += $(console_SOURCES)
-librtemsbsp_a_SOURCES += $(irq_SOURCES)
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index 30aabcd777..3645ef129c 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -15,40 +15,37 @@ project_lib_DATA = start.$(OBJEXT)
dist_project_lib_DATA += ../shared/startup/linkcmds
-startup_SOURCES = startup/bspclean.c startup/m5op_sparc.S \
- ../../shared/bsppredriverhook.c \
- ../../shared/bootcard.c ../../shared/sbrk.c \
- ../../shared/getentropy-cpucounter.c \
- ../../shared/bspgetworkarea.c \
- ../../shared/bspstart.c \
- ../../shared/bspreset.c \
- ../shared/startup/setvec.c \
- ../../shared/gnatinstallhandler.c \
- ../shared/helenos/boot/genarch/balloc.c \
- ../shared/helenos/boot/genarch/ofw.c \
- ../shared/helenos/boot/genarch/ofw_tree.c \
- ../shared/helenos/boot/generic/string.c \
- ../shared/helenos/boot/sparc64/loader/ofwarch.c \
- ../shared/helenos/boot/sparc64/loader/main.c \
- ../shared/helenos/boot/sparc64/loader/ofwasm.S \
- start/bspinit.S \
- ../shared/asm/asm.S
-
-#clock_SOURCES = ../../shared/clock_driver_simidle.c
-clock_SOURCES = ../shared/clock/ckinit.c
-
-console_SOURCES = ../shared/console/conscfg.c
-console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
-console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
-console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-
-timer_SOURCES = ../../shared/timerstub.c
-
project_lib_LIBRARIES = librtemsbsp.a
-librtemsbsp_a_SOURCES = $(startup_SOURCES)
-librtemsbsp_a_SOURCES += $(clock_SOURCES)
-librtemsbsp_a_SOURCES += $(console_SOURCES)
-librtemsbsp_a_SOURCES += $(timer_SOURCES)
+librtemsbsp_a_SOURCES =
+librtemsbsp_a_SOURCES += startup/bspclean.c
+librtemsbsp_a_SOURCES += startup/m5op_sparc.S
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += ../shared/startup/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/balloc.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/ofw.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/ofw_tree.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/generic/string.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/sparc64/loader/ofwarch.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/sparc64/loader/main.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/sparc64/loader/ofwasm.S
+librtemsbsp_a_SOURCES += start/bspinit.S
+librtemsbsp_a_SOURCES += ../shared/asm/asm.S
+
+librtemsbsp_a_SOURCES += ../shared/clock/ckinit.c
+
+librtemsbsp_a_SOURCES += ../shared/console/conscfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
+
+librtemsbsp_a_SOURCES += ../../shared/timerstub.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index 72fb5eaac3..54a67aafe5 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -23,46 +23,40 @@ project_lib_DATA = start.$(OBJEXT)
dist_project_lib_DATA += ../shared/startup/linkcmds
-startup_SOURCES = ../../shared/bspclean.c \
- ../../shared/bspstart.c \
- ../../shared/bootcard.c ../../shared/sbrk.c \
- ../../shared/getentropy-cpucounter.c \
- ../../shared/bspgetworkarea.c \
- ../../shared/bsppredriverhook.c \
- ../../shared/bspreset.c \
- ../shared/startup/setvec.c \
- ../../shared/gnatinstallhandler.c \
- ../shared/helenos/boot/genarch/balloc.c \
- ../shared/helenos/boot/genarch/ofw.c \
- ../shared/helenos/boot/genarch/ofw_tree.c \
- ../shared/helenos/boot/generic/string.c \
- ../shared/helenos/boot/sparc64/loader/ofwarch.c \
- ../shared/helenos/boot/sparc64/loader/main.c \
- ../shared/helenos/boot/sparc64/loader/ofwasm.S \
- ../shared/asm/asm.S \
- start/bspinit.S
-
-mmu_SOURCES = \
- ../shared/helenos/kernel/sparc64/src/cache.S \
- ../shared/helenos/kernel/sparc64/src/sun4u/takemmu.S \
- ../shared/start/trap_table.S
-
-#clock_SOURCES = ../../shared/clock_driver_simidle.c
-clock_SOURCES = ../shared/clock/ckinit.c
-
-console_SOURCES = ../shared/console/conscfg.c
-console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
-console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
-console_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
-
-timer_SOURCES = ../../shared/timerstub.c
-
project_lib_LIBRARIES = librtemsbsp.a
-librtemsbsp_a_SOURCES = $(startup_SOURCES)
-librtemsbsp_a_SOURCES += $(mmu_SOURCES)
-librtemsbsp_a_SOURCES += $(clock_SOURCES)
-librtemsbsp_a_SOURCES += $(console_SOURCES)
-librtemsbsp_a_SOURCES += $(timer_SOURCES)
+librtemsbsp_a_SOURCES =
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += ../shared/startup/setvec.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/balloc.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/ofw.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/ofw_tree.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/generic/string.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/sparc64/loader/ofwarch.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/sparc64/loader/main.c
+librtemsbsp_a_SOURCES += ../shared/helenos/boot/sparc64/loader/ofwasm.S
+librtemsbsp_a_SOURCES += ../shared/asm/asm.S
+librtemsbsp_a_SOURCES += start/bspinit.S
+
+librtemsbsp_a_SOURCES += ../shared/helenos/kernel/sparc64/src/cache.S
+librtemsbsp_a_SOURCES += ../shared/helenos/kernel/sparc64/src/sun4u/takemmu.S
+librtemsbsp_a_SOURCES += ../shared/start/trap_table.S
+
+librtemsbsp_a_SOURCES += ../shared/clock/ckinit.c
+
+librtemsbsp_a_SOURCES += ../shared/console/conscfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-control.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console-select.c
+
+librtemsbsp_a_SOURCES += ../../shared/timerstub.c
librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
--
2.12.3
More information about the devel
mailing list