summaryrefslogtreecommitdiffstats
path: root/cpukit/score/cpu/m68k
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-09-10 17:38:14 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-10-10 14:06:28 +0200
commit2548d14b82b4baab29b7b680ec799042983dff8f (patch)
treea604fdea7675d3af51e069c7df1a839f89d7541d /cpukit/score/cpu/m68k
parenttelnetd: Remove keep stdio feature (diff)
downloadrtems-2548d14b82b4baab29b7b680ec799042983dff8f.tar.bz2
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.
Diffstat (limited to 'cpukit/score/cpu/m68k')
-rw-r--r--cpukit/score/cpu/m68k/Makefile.am1
-rw-r--r--cpukit/score/cpu/m68k/headers.am32
2 files changed, 10 insertions, 23 deletions
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