From 2548d14b82b4baab29b7b680ec799042983dff8f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 10 Sep 2018 17:38:14 +0200 Subject: build: Include header.am in cpukit/Makefile.am Include all cpukit/*/header.am files in cpukit/Makefile.am. This gets rid of all subtree Makefile.am and the sudirs hack. --- cpukit/score/cpu/Makefile.am | 23 ----------------------- cpukit/score/cpu/arm/Makefile.am | 1 - cpukit/score/cpu/arm/headers.am | 34 +++++++++++----------------------- cpukit/score/cpu/bfin/Makefile.am | 1 - cpukit/score/cpu/bfin/headers.am | 32 ++++++++++---------------------- cpukit/score/cpu/epiphany/Makefile.am | 1 - cpukit/score/cpu/epiphany/headers.am | 20 +++++++------------- cpukit/score/cpu/h8300/headers.am | 5 +---- cpukit/score/cpu/i386/Makefile.am | 1 - cpukit/score/cpu/i386/headers.am | 29 ++++++++++------------------- cpukit/score/cpu/lm32/Makefile.am | 1 - cpukit/score/cpu/lm32/headers.am | 23 +++++++---------------- cpukit/score/cpu/m32c/Makefile.am | 1 - cpukit/score/cpu/m32c/headers.am | 22 +++++++--------------- cpukit/score/cpu/m68k/Makefile.am | 1 - cpukit/score/cpu/m68k/headers.am | 32 ++++++++++---------------------- cpukit/score/cpu/mips/Makefile.am | 1 - cpukit/score/cpu/mips/headers.am | 28 ++++++++-------------------- cpukit/score/cpu/moxie/Makefile.am | 1 - cpukit/score/cpu/moxie/headers.am | 21 ++++++--------------- cpukit/score/cpu/nios2/Makefile.am | 1 - cpukit/score/cpu/nios2/headers.am | 27 +++++++++------------------ cpukit/score/cpu/no_cpu/Makefile.am | 1 - cpukit/score/cpu/no_cpu/headers.am | 16 +++++----------- cpukit/score/cpu/or1k/Makefile.am | 1 - cpukit/score/cpu/or1k/headers.am | 20 +++++++------------- cpukit/score/cpu/powerpc/Makefile.am | 1 - cpukit/score/cpu/powerpc/headers.am | 28 ++++++++-------------------- cpukit/score/cpu/riscv/Makefile.am | 1 - cpukit/score/cpu/riscv/headers.am | 20 +++++++------------- cpukit/score/cpu/sh/Makefile.am | 1 - cpukit/score/cpu/sh/headers.am | 18 ++++++------------ cpukit/score/cpu/sparc/Makefile.am | 1 - cpukit/score/cpu/sparc/headers.am | 30 +++++++++--------------------- cpukit/score/cpu/sparc64/Makefile.am | 1 - cpukit/score/cpu/sparc64/headers.am | 16 +++++----------- cpukit/score/cpu/v850/Makefile.am | 1 - cpukit/score/cpu/v850/headers.am | 23 +++++++---------------- cpukit/score/cpu/x86_64/Makefile.am | 1 - cpukit/score/cpu/x86_64/headers.am | 25 ++++++++----------------- 40 files changed, 148 insertions(+), 363 deletions(-) delete mode 100644 cpukit/score/cpu/Makefile.am delete mode 100644 cpukit/score/cpu/arm/Makefile.am delete mode 100644 cpukit/score/cpu/bfin/Makefile.am delete mode 100644 cpukit/score/cpu/epiphany/Makefile.am delete mode 100644 cpukit/score/cpu/i386/Makefile.am delete mode 100644 cpukit/score/cpu/lm32/Makefile.am delete mode 100644 cpukit/score/cpu/m32c/Makefile.am delete mode 100644 cpukit/score/cpu/m68k/Makefile.am delete mode 100644 cpukit/score/cpu/mips/Makefile.am delete mode 100644 cpukit/score/cpu/moxie/Makefile.am delete mode 100644 cpukit/score/cpu/nios2/Makefile.am delete mode 100644 cpukit/score/cpu/no_cpu/Makefile.am delete mode 100644 cpukit/score/cpu/or1k/Makefile.am delete mode 100644 cpukit/score/cpu/powerpc/Makefile.am delete mode 100644 cpukit/score/cpu/riscv/Makefile.am delete mode 100644 cpukit/score/cpu/sh/Makefile.am delete mode 100644 cpukit/score/cpu/sparc/Makefile.am delete mode 100644 cpukit/score/cpu/sparc64/Makefile.am delete mode 100644 cpukit/score/cpu/v850/Makefile.am delete mode 100644 cpukit/score/cpu/x86_64/Makefile.am (limited to 'cpukit/score/cpu') diff --git a/cpukit/score/cpu/Makefile.am b/cpukit/score/cpu/Makefile.am deleted file mode 100644 index 03cd431f48..0000000000 --- a/cpukit/score/cpu/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -_SUBDIRS = @RTEMS_CPU@ - -DIST_SUBDIRS = -DIST_SUBDIRS += arm -DIST_SUBDIRS += bfin -DIST_SUBDIRS += epiphany -DIST_SUBDIRS += i386 -DIST_SUBDIRS += lm32 -DIST_SUBDIRS += m32c -DIST_SUBDIRS += m68k -DIST_SUBDIRS += mips -DIST_SUBDIRS += moxie -DIST_SUBDIRS += nios2 -DIST_SUBDIRS += no_cpu -DIST_SUBDIRS += or1k -DIST_SUBDIRS += powerpc -DIST_SUBDIRS += riscv -DIST_SUBDIRS += sh -DIST_SUBDIRS += sparc -DIST_SUBDIRS += sparc64 -DIST_SUBDIRS += v850 - -include $(top_srcdir)/automake/subdirs.am diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/arm/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/arm/headers.am b/cpukit/score/cpu/arm/headers.am index 9bbc7015b9..0cf2707373 100644 --- a/cpukit/score/cpu/arm/headers.am +++ b/cpukit/score/cpu/arm/headers.am @@ -1,24 +1,12 @@ ## This file was generated by "./boostrap -H". - -include_libcpudir = $(includedir)/libcpu -include_libcpu_HEADERS = -include_libcpu_HEADERS += include/libcpu/arm-cp15.h - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/arm.h -include_rtems_score_HEADERS += include/rtems/score/armv4.h -include_rtems_score_HEADERS += include/rtems/score/armv7m.h -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/paravirt.h +include_libcpu_HEADERS += score/cpu/arm/include/libcpu/arm-cp15.h +include_machine_HEADERS += score/cpu/arm/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/arm/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/arm/include/rtems/score/arm.h +include_rtems_score_HEADERS += score/cpu/arm/include/rtems/score/armv4.h +include_rtems_score_HEADERS += score/cpu/arm/include/rtems/score/armv7m.h +include_rtems_score_HEADERS += score/cpu/arm/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/arm/include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += score/cpu/arm/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/arm/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/arm/include/rtems/score/paravirt.h diff --git a/cpukit/score/cpu/bfin/Makefile.am b/cpukit/score/cpu/bfin/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/bfin/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/bfin/headers.am b/cpukit/score/cpu/bfin/headers.am index d6ff410d50..e0f6cfca74 100644 --- a/cpukit/score/cpu/bfin/headers.am +++ b/cpukit/score/cpu/bfin/headers.am @@ -1,23 +1,11 @@ ## This file was generated by "./boostrap -H". - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_bfindir = $(includedir)/rtems/bfin -include_rtems_bfin_HEADERS = -include_rtems_bfin_HEADERS += include/rtems/bfin/bf52x.h -include_rtems_bfin_HEADERS += include/rtems/bfin/bf533.h -include_rtems_bfin_HEADERS += include/rtems/bfin/bfin.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/bfin.h -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h +include_machine_HEADERS += score/cpu/bfin/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/bfin/include/rtems/asm.h +include_rtems_bfin_HEADERS += score/cpu/bfin/include/rtems/bfin/bf52x.h +include_rtems_bfin_HEADERS += score/cpu/bfin/include/rtems/bfin/bf533.h +include_rtems_bfin_HEADERS += score/cpu/bfin/include/rtems/bfin/bfin.h +include_rtems_score_HEADERS += score/cpu/bfin/include/rtems/score/bfin.h +include_rtems_score_HEADERS += score/cpu/bfin/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/bfin/include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += score/cpu/bfin/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/bfin/include/rtems/score/cpuimpl.h diff --git a/cpukit/score/cpu/epiphany/Makefile.am b/cpukit/score/cpu/epiphany/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/epiphany/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/epiphany/headers.am b/cpukit/score/cpu/epiphany/headers.am index c175bd2d19..d5ba2394d9 100644 --- a/cpukit/score/cpu/epiphany/headers.am +++ b/cpukit/score/cpu/epiphany/headers.am @@ -1,14 +1,8 @@ ## This file was generated by "./boostrap -H". - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/epiphany-utility.h -include_rtems_score_HEADERS += include/rtems/score/epiphany.h +include_rtems_HEADERS += score/cpu/epiphany/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/epiphany/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/epiphany/include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += score/cpu/epiphany/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/epiphany/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/epiphany/include/rtems/score/epiphany-utility.h +include_rtems_score_HEADERS += score/cpu/epiphany/include/rtems/score/epiphany.h diff --git a/cpukit/score/cpu/h8300/headers.am b/cpukit/score/cpu/h8300/headers.am index 6f4357916f..9a5d7f6785 100644 --- a/cpukit/score/cpu/h8300/headers.am +++ b/cpukit/score/cpu/h8300/headers.am @@ -1,5 +1,2 @@ ## This file was generated by "./boostrap -H". - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h +include_machine_HEADERS += score/cpu/h8300/include/machine/elf_machdep.h diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/i386/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/i386/headers.am b/cpukit/score/cpu/i386/headers.am index 79d21f762c..e984232d9b 100644 --- a/cpukit/score/cpu/i386/headers.am +++ b/cpukit/score/cpu/i386/headers.am @@ -1,20 +1,11 @@ ## This file was generated by "./boostrap -H". - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/i386.h -include_rtems_score_HEADERS += include/rtems/score/idtr.h -include_rtems_score_HEADERS += include/rtems/score/interrupts.h -include_rtems_score_HEADERS += include/rtems/score/paravirt.h -include_rtems_score_HEADERS += include/rtems/score/registers.h +include_machine_HEADERS += score/cpu/i386/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/i386/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/i386/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/i386/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/i386/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/i386/include/rtems/score/i386.h +include_rtems_score_HEADERS += score/cpu/i386/include/rtems/score/idtr.h +include_rtems_score_HEADERS += score/cpu/i386/include/rtems/score/interrupts.h +include_rtems_score_HEADERS += score/cpu/i386/include/rtems/score/paravirt.h +include_rtems_score_HEADERS += score/cpu/i386/include/rtems/score/registers.h diff --git a/cpukit/score/cpu/lm32/Makefile.am b/cpukit/score/cpu/lm32/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/lm32/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/lm32/headers.am b/cpukit/score/cpu/lm32/headers.am index 178f3756d4..b77dfb5ab3 100644 --- a/cpukit/score/cpu/lm32/headers.am +++ b/cpukit/score/cpu/lm32/headers.am @@ -1,17 +1,8 @@ ## This file was generated by "./boostrap -H". - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/lm32.h +include_machine_HEADERS += score/cpu/lm32/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/lm32/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/lm32/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/lm32/include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += score/cpu/lm32/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/lm32/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/lm32/include/rtems/score/lm32.h diff --git a/cpukit/score/cpu/m32c/Makefile.am b/cpukit/score/cpu/m32c/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/m32c/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/m32c/headers.am b/cpukit/score/cpu/m32c/headers.am index 3b2a7a759f..1428005bfc 100644 --- a/cpukit/score/cpu/m32c/headers.am +++ b/cpukit/score/cpu/m32c/headers.am @@ -1,16 +1,8 @@ ## This file was generated by "./boostrap -H". - -include_HEADERS = -include_HEADERS += include/varvects.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/m32c.h +include_HEADERS += score/cpu/m32c/include/varvects.h +include_rtems_HEADERS += score/cpu/m32c/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/m32c/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/m32c/include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += score/cpu/m32c/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/m32c/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/m32c/include/rtems/score/m32c.h diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/m68k/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/m68k/headers.am b/cpukit/score/cpu/m68k/headers.am index ee8c36cadc..3fdc6fe2bd 100644 --- a/cpukit/score/cpu/m68k/headers.am +++ b/cpukit/score/cpu/m68k/headers.am @@ -1,23 +1,11 @@ ## This file was generated by "./boostrap -H". - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_m68kdir = $(includedir)/rtems/m68k -include_rtems_m68k_HEADERS = -include_rtems_m68k_HEADERS += include/rtems/m68k/m68302.h -include_rtems_m68k_HEADERS += include/rtems/m68k/m68360.h -include_rtems_m68k_HEADERS += include/rtems/m68k/qsm.h -include_rtems_m68k_HEADERS += include/rtems/m68k/sim.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/m68k.h +include_machine_HEADERS += score/cpu/m68k/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/m68k/include/rtems/asm.h +include_rtems_m68k_HEADERS += score/cpu/m68k/include/rtems/m68k/m68302.h +include_rtems_m68k_HEADERS += score/cpu/m68k/include/rtems/m68k/m68360.h +include_rtems_m68k_HEADERS += score/cpu/m68k/include/rtems/m68k/qsm.h +include_rtems_m68k_HEADERS += score/cpu/m68k/include/rtems/m68k/sim.h +include_rtems_score_HEADERS += score/cpu/m68k/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/m68k/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/m68k/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/m68k/include/rtems/score/m68k.h diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/mips/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/mips/headers.am b/cpukit/score/cpu/mips/headers.am index a1effb7986..3084000f09 100644 --- a/cpukit/score/cpu/mips/headers.am +++ b/cpukit/score/cpu/mips/headers.am @@ -1,21 +1,9 @@ ## This file was generated by "./boostrap -H". - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_mipsdir = $(includedir)/rtems/mips -include_rtems_mips_HEADERS = -include_rtems_mips_HEADERS += include/rtems/mips/idtcpu.h -include_rtems_mips_HEADERS += include/rtems/mips/iregdef.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/mips.h +include_machine_HEADERS += score/cpu/mips/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/mips/include/rtems/asm.h +include_rtems_mips_HEADERS += score/cpu/mips/include/rtems/mips/idtcpu.h +include_rtems_mips_HEADERS += score/cpu/mips/include/rtems/mips/iregdef.h +include_rtems_score_HEADERS += score/cpu/mips/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/mips/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/mips/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/mips/include/rtems/score/mips.h diff --git a/cpukit/score/cpu/moxie/Makefile.am b/cpukit/score/cpu/moxie/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/moxie/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/moxie/headers.am b/cpukit/score/cpu/moxie/headers.am index 9097db9573..6324166c86 100644 --- a/cpukit/score/cpu/moxie/headers.am +++ b/cpukit/score/cpu/moxie/headers.am @@ -1,16 +1,7 @@ ## This file was generated by "./boostrap -H". - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/moxie.h +include_machine_HEADERS += score/cpu/moxie/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/moxie/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/moxie/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/moxie/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/moxie/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/moxie/include/rtems/score/moxie.h diff --git a/cpukit/score/cpu/nios2/Makefile.am b/cpukit/score/cpu/nios2/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/nios2/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/nios2/headers.am b/cpukit/score/cpu/nios2/headers.am index b5ca7890fe..253f64d03a 100644 --- a/cpukit/score/cpu/nios2/headers.am +++ b/cpukit/score/cpu/nios2/headers.am @@ -1,19 +1,10 @@ ## This file was generated by "./boostrap -H". - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/nios2-count-zeros.h -include_rtems_score_HEADERS += include/rtems/score/nios2-utility.h -include_rtems_score_HEADERS += include/rtems/score/nios2.h +include_machine_HEADERS += score/cpu/nios2/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/nios2/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/nios2/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/nios2/include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += score/cpu/nios2/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/nios2/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/nios2/include/rtems/score/nios2-count-zeros.h +include_rtems_score_HEADERS += score/cpu/nios2/include/rtems/score/nios2-utility.h +include_rtems_score_HEADERS += score/cpu/nios2/include/rtems/score/nios2.h diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/no_cpu/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/no_cpu/headers.am b/cpukit/score/cpu/no_cpu/headers.am index ee24fb131d..6a8c54df42 100644 --- a/cpukit/score/cpu/no_cpu/headers.am +++ b/cpukit/score/cpu/no_cpu/headers.am @@ -1,12 +1,6 @@ ## This file was generated by "./boostrap -H". - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/no_cpu.h +include_rtems_HEADERS += score/cpu/no_cpu/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/no_cpu/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/no_cpu/include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += score/cpu/no_cpu/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/no_cpu/include/rtems/score/no_cpu.h diff --git a/cpukit/score/cpu/or1k/Makefile.am b/cpukit/score/cpu/or1k/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/or1k/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/or1k/headers.am b/cpukit/score/cpu/or1k/headers.am index 172e23c79f..e65d66464d 100644 --- a/cpukit/score/cpu/or1k/headers.am +++ b/cpukit/score/cpu/or1k/headers.am @@ -1,14 +1,8 @@ ## This file was generated by "./boostrap -H". - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/or1k-utility.h -include_rtems_score_HEADERS += include/rtems/score/or1k.h +include_rtems_HEADERS += score/cpu/or1k/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/or1k/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/or1k/include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += score/cpu/or1k/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/or1k/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/or1k/include/rtems/score/or1k-utility.h +include_rtems_score_HEADERS += score/cpu/or1k/include/rtems/score/or1k.h diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/powerpc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/powerpc/headers.am b/cpukit/score/cpu/powerpc/headers.am index df026fab45..5f016a21d1 100644 --- a/cpukit/score/cpu/powerpc/headers.am +++ b/cpukit/score/cpu/powerpc/headers.am @@ -1,21 +1,9 @@ ## This file was generated by "./boostrap -H". - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_powerpcdir = $(includedir)/rtems/powerpc -include_rtems_powerpc_HEADERS = -include_rtems_powerpc_HEADERS += include/rtems/powerpc/registers.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/paravirt.h -include_rtems_score_HEADERS += include/rtems/score/powerpc.h +include_machine_HEADERS += score/cpu/powerpc/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/powerpc/include/rtems/asm.h +include_rtems_powerpc_HEADERS += score/cpu/powerpc/include/rtems/powerpc/registers.h +include_rtems_score_HEADERS += score/cpu/powerpc/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/powerpc/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/powerpc/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/powerpc/include/rtems/score/paravirt.h +include_rtems_score_HEADERS += score/cpu/powerpc/include/rtems/score/powerpc.h diff --git a/cpukit/score/cpu/riscv/Makefile.am b/cpukit/score/cpu/riscv/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/riscv/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/riscv/headers.am b/cpukit/score/cpu/riscv/headers.am index ec53f7d400..415075ce46 100644 --- a/cpukit/score/cpu/riscv/headers.am +++ b/cpukit/score/cpu/riscv/headers.am @@ -1,14 +1,8 @@ ## This file was generated by "./boostrap -H". - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/riscv-utility.h -include_rtems_score_HEADERS += include/rtems/score/riscv.h +include_rtems_HEADERS += score/cpu/riscv/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/riscv/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/riscv/include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += score/cpu/riscv/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/riscv/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/riscv/include/rtems/score/riscv-utility.h +include_rtems_score_HEADERS += score/cpu/riscv/include/rtems/score/riscv.h diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/sh/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/sh/headers.am b/cpukit/score/cpu/sh/headers.am index da3449acb4..ccb3b94eb5 100644 --- a/cpukit/score/cpu/sh/headers.am +++ b/cpukit/score/cpu/sh/headers.am @@ -1,13 +1,7 @@ ## This file was generated by "./boostrap -H". - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/sh.h -include_rtems_score_HEADERS += include/rtems/score/sh_io.h +include_rtems_HEADERS += score/cpu/sh/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/sh/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/sh/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/sh/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/sh/include/rtems/score/sh.h +include_rtems_score_HEADERS += score/cpu/sh/include/rtems/score/sh_io.h diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/sparc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/sparc/headers.am b/cpukit/score/cpu/sparc/headers.am index f0c179c827..f5fc1aa9e2 100644 --- a/cpukit/score/cpu/sparc/headers.am +++ b/cpukit/score/cpu/sparc/headers.am @@ -1,22 +1,10 @@ ## This file was generated by "./boostrap -H". - -include_libcpudir = $(includedir)/libcpu -include_libcpu_HEADERS = -include_libcpu_HEADERS += include/libcpu/access.h -include_libcpu_HEADERS += include/libcpu/byteorder.h - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/sparc.h -include_rtems_score_HEADERS += include/rtems/score/sparcimpl.h +include_libcpu_HEADERS += score/cpu/sparc/include/libcpu/access.h +include_libcpu_HEADERS += score/cpu/sparc/include/libcpu/byteorder.h +include_machine_HEADERS += score/cpu/sparc/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/sparc/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/sparc/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/sparc/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/sparc/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/sparc/include/rtems/score/sparc.h +include_rtems_score_HEADERS += score/cpu/sparc/include/rtems/score/sparcimpl.h diff --git a/cpukit/score/cpu/sparc64/Makefile.am b/cpukit/score/cpu/sparc64/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/sparc64/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/sparc64/headers.am b/cpukit/score/cpu/sparc64/headers.am index 9ec614509b..a2a1c1fb2c 100644 --- a/cpukit/score/cpu/sparc64/headers.am +++ b/cpukit/score/cpu/sparc64/headers.am @@ -1,12 +1,6 @@ ## This file was generated by "./boostrap -H". - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/sparc64.h +include_rtems_HEADERS += score/cpu/sparc64/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/sparc64/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/sparc64/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/sparc64/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/sparc64/include/rtems/score/sparc64.h diff --git a/cpukit/score/cpu/v850/Makefile.am b/cpukit/score/cpu/v850/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/v850/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/v850/headers.am b/cpukit/score/cpu/v850/headers.am index 47ca503dba..547f128401 100644 --- a/cpukit/score/cpu/v850/headers.am +++ b/cpukit/score/cpu/v850/headers.am @@ -1,17 +1,8 @@ ## This file was generated by "./boostrap -H". - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/v850.h +include_machine_HEADERS += score/cpu/v850/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/v850/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/v850/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/v850/include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += score/cpu/v850/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/v850/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/v850/include/rtems/score/v850.h diff --git a/cpukit/score/cpu/x86_64/Makefile.am b/cpukit/score/cpu/x86_64/Makefile.am deleted file mode 100644 index 6f4affd6b5..0000000000 --- a/cpukit/score/cpu/x86_64/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/x86_64/headers.am b/cpukit/score/cpu/x86_64/headers.am index 02798adf54..3ce32c3317 100644 --- a/cpukit/score/cpu/x86_64/headers.am +++ b/cpukit/score/cpu/x86_64/headers.am @@ -1,18 +1,9 @@ ## This file was generated by "./boostrap -H". - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += include/machine/elf_machdep.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += include/rtems/asm.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = -include_rtems_score_HEADERS += include/rtems/score/cpu.h -include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h -include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h -include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/idt.h -include_rtems_score_HEADERS += include/rtems/score/x86_64.h +include_machine_HEADERS += score/cpu/x86_64/include/machine/elf_machdep.h +include_rtems_HEADERS += score/cpu/x86_64/include/rtems/asm.h +include_rtems_score_HEADERS += score/cpu/x86_64/include/rtems/score/cpu.h +include_rtems_score_HEADERS += score/cpu/x86_64/include/rtems/score/cpu_asm.h +include_rtems_score_HEADERS += score/cpu/x86_64/include/rtems/score/cpuatomic.h +include_rtems_score_HEADERS += score/cpu/x86_64/include/rtems/score/cpuimpl.h +include_rtems_score_HEADERS += score/cpu/x86_64/include/rtems/score/idt.h +include_rtems_score_HEADERS += score/cpu/x86_64/include/rtems/score/x86_64.h -- cgit v1.2.3