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/nios2/Makefile.am | 1 - cpukit/score/cpu/nios2/headers.am | 27 +++++++++------------------ 2 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 cpukit/score/cpu/nios2/Makefile.am (limited to 'cpukit/score/cpu/nios2') 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 -- cgit v1.2.3