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. --- bootstrap | 57 ++++++-- cpukit/Makefile.am | 56 +++++++- cpukit/automake/subdirs.am | 53 -------- cpukit/configure.ac | 24 +--- cpukit/header-dirs.am | 80 +++++++++++ cpukit/headers.am | 65 --------- cpukit/libnetworking/Makefile.am | 3 - cpukit/libnetworking/headers.am | 245 +++++++++++++++------------------- cpukit/score/Makefile.am | 9 -- 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 ++-- 49 files changed, 435 insertions(+), 668 deletions(-) delete mode 100644 cpukit/automake/subdirs.am create mode 100644 cpukit/header-dirs.am delete mode 100644 cpukit/libnetworking/Makefile.am delete mode 100644 cpukit/score/Makefile.am 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 diff --git a/bootstrap b/bootstrap index 8e284a552e..7ed592d435 100755 --- a/bootstrap +++ b/bootstrap @@ -81,21 +81,58 @@ headers) exit 1 fi base="$PWD" + + # Generate cpukit/header-dirs.am + tmp="$base/cpukit/header-dirs.am.new" + hdr_dirs=`for i in cpukit/include cpukit/libnetworking cpukit/score/cpu/*/include ; do + cd "$i" + find -mindepth 1 -type d + cd "$base" + done | sort -u | sed 's%^\./%%'` + echo '## This file was generated by "./boostrap -H".' > "$tmp" + echo 'include_HEADERS =' >> "$tmp" + for dir in $hdr_dirs ; do + am_dir=`echo $dir | sed 's%[/-]%_%g'` + echo "include_${am_dir}dir = \$(includedir)/$dir" >> "$tmp" + echo "include_${am_dir}_HEADERS =" >> "$tmp" + done + diff -q "$tmp" "cpukit/header-dirs.am" || mv "$tmp" "cpukit/header-dirs.am" + rm -f "$tmp" + + # Generate cpukit/*/headers.am tmp="$base/headers.am.new" - for i in cpukit/include cpukit/score/cpu/*/include bsps/include bsps/*/include bsps/*/*/include ; do + cpukit="$base/cpukit" + cd "$cpukit" + for inc in include score/cpu/*/include ; do + echo '## This file was generated by "./boostrap -H".' > "$tmp" + hdr=`dirname $inc` + am_dir="" + cd $inc + for b in `find -type d | sort` ; do + for j in `find $b -mindepth 1 -maxdepth 1 -name '*.h' | sed 's%^\.%%' | sed 's%^/%%' | sort` ; do + dir=`dirname $j` + if test x$dir != x. ; then + am_dir=`echo $dir | sed 's%[/-]%_%g'` + am_dir="_$am_dir" + else + am_dir="" + fi + echo "include${am_dir}_HEADERS += $inc/$j" >> "$tmp" + done + done + cd "$cpukit" + diff -q "$tmp" "${hdr}/headers.am" || mv "$tmp" "${hdr}/headers.am" + done + rm -f "$tmp" + cd "$base" + + # Generate bsps/*/headers.am + tmp="$base/headers.am.new" + for i in bsps/include bsps/*/include bsps/*/*/include ; do dir="" am_dir="" echo '## This file was generated by "./boostrap -H".' > "$tmp" case $i in - cpukit/include) - hdr="../" - inc="include/" - ;; - cpukit/score/cpu/*/include) - hdr="../" - inc=`echo $i | cut -d'/' -f5-` - inc="$inc/" - ;; bsps/*/*/include) hdr="../" inc="../../../../../../$i/" diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index cf0888adb6..2a5673242f 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -2,6 +2,17 @@ ACLOCAL_AMFLAGS = -I aclocal include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/multilib.am +include $(srcdir)/header-dirs.am +include $(srcdir)/headers.am + +if LIBNETWORKING + +include $(srcdir)/libnetworking/headers.am + +endif + +# This file is in the build tree +include_rtems_score_HEADERS += ../include/rtems/score/cpuopts.h project_lib_LIBRARIES = @@ -1505,6 +1516,8 @@ endif if CPU_ARM +include $(srcdir)/score/cpu/arm/headers.am + librtemscpu_a_SOURCES += score/cpu/arm/__aeabi_read_tp.c librtemscpu_a_SOURCES += score/cpu/arm/arm-context-validate.S librtemscpu_a_SOURCES += score/cpu/arm/arm-context-volatile-clobber.S @@ -1539,6 +1552,8 @@ endif if CPU_BFIN +include $(srcdir)/score/cpu/bfin/headers.am + librtemscpu_a_SOURCES += score/cpu/bfin/bfin-exception-frame-print.c librtemscpu_a_SOURCES += score/cpu/bfin/cpu_asm.S librtemscpu_a_SOURCES += score/cpu/bfin/cpu.c @@ -1549,6 +1564,8 @@ endif if CPU_EPIPHANY +include $(srcdir)/score/cpu/epiphany/headers.am + librtemscpu_a_SOURCES += score/cpu/epiphany/cpu.c librtemscpu_a_SOURCES += score/cpu/epiphany/epiphany-context-initialize.c librtemscpu_a_SOURCES += score/cpu/epiphany/epiphany-context-switch.S @@ -1560,6 +1577,8 @@ endif if CPU_I386 +include $(srcdir)/score/cpu/i386/headers.am + librtemscpu_a_SOURCES += score/cpu/i386/cpu_asm.S librtemscpu_a_SOURCES += score/cpu/i386/cpu.c librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterfrequency.c @@ -1570,6 +1589,8 @@ endif if CPU_LM32 +include $(srcdir)/score/cpu/lm32/headers.am + librtemscpu_a_SOURCES += score/cpu/lm32/cpu_asm.S librtemscpu_a_SOURCES += score/cpu/lm32/cpu.c librtemscpu_a_SOURCES += score/cpu/lm32/irq.c @@ -1581,6 +1602,8 @@ endif if CPU_M32C +include $(srcdir)/score/cpu/m32c/headers.am + librtemscpu_a_SOURCES += score/cpu/m32c/context_init.c librtemscpu_a_SOURCES += score/cpu/m32c/context_switch.S librtemscpu_a_SOURCES += score/cpu/m32c/cpu_asm.c @@ -1594,6 +1617,8 @@ endif if CPU_M68K +include $(srcdir)/score/cpu/m68k/headers.am + librtemscpu_a_SOURCES += score/cpu/m68k/cpu_asm.S librtemscpu_a_SOURCES += score/cpu/m68k/cpu.c librtemscpu_a_SOURCES += score/cpu/m68k/m68k-exception-frame-print.c @@ -1605,6 +1630,8 @@ endif if CPU_MIPS +include $(srcdir)/score/cpu/mips/headers.am + librtemscpu_a_SOURCES += score/cpu/mips/cpu.c librtemscpu_a_SOURCES += score/cpu/mips/cpu_asm.S librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterfrequency.c @@ -1614,6 +1641,8 @@ endif if CPU_MOXIE +include $(srcdir)/score/cpu/moxie/headers.am + librtemscpu_a_SOURCES += score/cpu/moxie/cpu.c librtemscpu_a_SOURCES += score/cpu/moxie/moxie-exception-frame-print.c librtemscpu_a_SOURCES += score/cpu/moxie/cpu_asm.S @@ -1625,6 +1654,8 @@ endif if CPU_NIOS2 +include $(srcdir)/score/cpu/nios2/headers.am + librtemscpu_a_SOURCES += score/cpu/nios2/nios2-context-initialize.c librtemscpu_a_SOURCES += score/cpu/nios2/nios2-context-switch.S librtemscpu_a_SOURCES += score/cpu/nios2/nios2-context-validate.S @@ -1655,6 +1686,8 @@ endif if CPU_NO_CPU +include $(srcdir)/score/cpu/no_cpu/headers.am + librtemscpu_a_SOURCES += score/cpu/no_cpu/cpu.c librtemscpu_a_SOURCES += score/cpu/no_cpu/cpu_asm.c librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterfrequency.c @@ -1665,6 +1698,8 @@ endif if CPU_OR1K +include $(srcdir)/score/cpu/or1k/headers.am + librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterfrequency.c librtemscpu_a_SOURCES += score/cpu/or1k/cpu.c librtemscpu_a_SOURCES += score/cpu/or1k/or1k-context-initialize.c @@ -1679,6 +1714,8 @@ endif if CPU_POWERPC +include $(srcdir)/score/cpu/powerpc/headers.am + librtemscpu_a_SOURCES += score/cpu/no_cpu/cpuidle.c librtemscpu_a_SOURCES += score/cpu/powerpc/cpu.c librtemscpu_a_SOURCES += score/cpu/powerpc/ppc-context-volatile-clobber.S @@ -1690,6 +1727,8 @@ endif if CPU_RISCV +include $(srcdir)/score/cpu/riscv/headers.am + librtemscpu_a_SOURCES += score/cpu/riscv/cpu.c librtemscpu_a_SOURCES += score/cpu/riscv/riscv-exception-handler.S librtemscpu_a_SOURCES += score/cpu/riscv/riscv-exception-frame-print.c @@ -1703,6 +1742,8 @@ endif if CPU_SH +include $(srcdir)/score/cpu/sh/headers.am + librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterfrequency.c librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterread.c librtemscpu_a_SOURCES += score/cpu/no_cpu/cpuidle.c @@ -1714,6 +1755,8 @@ endif if CPU_SPARC64 +include $(srcdir)/score/cpu/sparc64/headers.am + librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterfrequency.c librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterread.c librtemscpu_a_SOURCES += score/cpu/no_cpu/cpuidle.c @@ -1727,6 +1770,8 @@ endif if CPU_SPARC +include $(srcdir)/score/cpu/sparc/headers.am + librtemscpu_a_SOURCES += score/cpu/no_cpu/cpuidle.c librtemscpu_a_SOURCES += score/cpu/sparc/access_le.c librtemscpu_a_SOURCES += score/cpu/sparc/cpu.c @@ -1743,6 +1788,8 @@ endif if CPU_V850 +include $(srcdir)/score/cpu/v850/headers.am + librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterfrequency.c librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterread.c librtemscpu_a_SOURCES += score/cpu/no_cpu/cpuidle.c @@ -1754,6 +1801,8 @@ endif if CPU_X86_64 +include $(srcdir)/score/cpu/x86_64/headers.am + librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterfrequency.c librtemscpu_a_SOURCES += score/cpu/no_cpu/cpucounterread.c librtemscpu_a_SOURCES += score/cpu/no_cpu/cpuidle.c @@ -1796,10 +1845,6 @@ $(top_srcdir)/sapi/src/version.c: version-vc-key.h all-local: generate-vc-key -# librtemscpu -_SUBDIRS = . score -_SUBDIRS += libnetworking - project_lib_LIBRARIES += libftpd.a libftpd_a_SOURCES = @@ -1929,6 +1974,3 @@ libmghttpd_a_SOURCES += mghttpd/mongoose.c endif endif - -include $(top_srcdir)/automake/subdirs.am -include $(srcdir)/headers.am diff --git a/cpukit/automake/subdirs.am b/cpukit/automake/subdirs.am deleted file mode 100644 index b36ad80735..0000000000 --- a/cpukit/automake/subdirs.am +++ /dev/null @@ -1,53 +0,0 @@ -## Copyright 2017 Chris Johns - -## -## The following builds in parallel. The subdirectories are -## expanded into separate rules and all the targets are listed -## and make runs as many as it can. -## -## A macro is defined and evaluated once for each directory. This -## creates the instance of the rule. Use $(info ...) to print them. -## - -SUBDIRS_dot = $(filter .,$(_SUBDIRS)) -SUBDIRS_no_dot = $(filter-out .,$(_SUBDIRS)) -SUBDIRS_no_dot_no_wrapup = $(filter-out wrapup,$(SUBDIRS_no_dot)) -SUBDIRS_wrapup = $(filter wrapup,$(SUBDIRS_no_dot)) - -preinstall: $(preintstall_targets) - -define CPUKITDIR -.PHONY: $1 -$1: $(preintstall_targets) - @+set fnord $(MAKEFLAGS); amf=$$$$2; \ - subdir=$(2); \ - target=`echo $(MAKECMDGOALS) | sed s/-recursive//`; \ - if test "$$$$target" = "all-local-am"; then \ - target="all-am"; \ - fi; \ - if test "$$$$target" = "all-local"; then \ - target="all"; \ - fi; \ - echo "Making $$$$target in $$$$subdir"; \ - if test "$$$$subdir" != "."; then \ - cd $$$$subdir; \ - $(MAKE) $(AM_MAKEFLAGS) $$$$target; \ - fi; -endef - -# -# This GNU make syntax is being used to stop automake thinking the code is for -# it. -# -$(if "$(SUBDIRS_dot)" ".",$(eval $(call CPUKITDIR,dot,.))) - -$(foreach D,$(SUBDIRS_no_dot),$(eval $(call CPUKITDIR,$(D),$(D)))) - -# -# If there is a wrapup make it depend on all other directories so it is not -# entered until they have finished. -# -$(if "$(SUBDIRS_wrapup)" "wrapup",wrapup: dot $(foreach D,$(SUBDIRS_no_dot_no_wrapup),$(D)),) - -all-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) -clean-local: $(if "$(SUBDIRS_dot)" ".",dot) $(SUBDIRS_no_dot) diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 7e8e2d9c0c..67889d2d8e 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -492,28 +492,6 @@ RTEMS_AMPOLISH3 # Explicitly list all Makefiles here AC_CONFIG_FILES([ Doxyfile -Makefile -score/Makefile -score/cpu/Makefile -score/cpu/arm/Makefile -score/cpu/bfin/Makefile -score/cpu/epiphany/Makefile -score/cpu/i386/Makefile -score/cpu/lm32/Makefile -score/cpu/m68k/Makefile -score/cpu/m32c/Makefile -score/cpu/mips/Makefile -score/cpu/moxie/Makefile -score/cpu/nios2/Makefile -score/cpu/or1k/Makefile -score/cpu/powerpc/Makefile -score/cpu/riscv/Makefile -score/cpu/sh/Makefile -score/cpu/sparc/Makefile -score/cpu/sparc64/Makefile -score/cpu/v850/Makefile -score/cpu/x86_64/Makefile -score/cpu/no_cpu/Makefile -libnetworking/Makefile]) +Makefile]) AC_OUTPUT diff --git a/cpukit/header-dirs.am b/cpukit/header-dirs.am new file mode 100644 index 0000000000..7197f1a29f --- /dev/null +++ b/cpukit/header-dirs.am @@ -0,0 +1,80 @@ +## This file was generated by "./boostrap -H". +include_HEADERS = +include_adaincludedir = $(includedir)/adainclude +include_adainclude_HEADERS = +include_arpadir = $(includedir)/arpa +include_arpa_HEADERS = +include_devdir = $(includedir)/dev +include_dev_HEADERS = +include_dev_i2cdir = $(includedir)/dev/i2c +include_dev_i2c_HEADERS = +include_dev_miidir = $(includedir)/dev/mii +include_dev_mii_HEADERS = +include_dev_serialdir = $(includedir)/dev/serial +include_dev_serial_HEADERS = +include_dev_spidir = $(includedir)/dev/spi +include_dev_spi_HEADERS = +include_drvmgrdir = $(includedir)/drvmgr +include_drvmgr_HEADERS = +include_kerndir = $(includedir)/kern +include_kern_HEADERS = +include_libdir = $(includedir)/lib +include_lib_HEADERS = +include_libcdir = $(includedir)/libc +include_libc_HEADERS = +include_libcpudir = $(includedir)/libcpu +include_libcpu_HEADERS = +include_linuxdir = $(includedir)/linux +include_linux_HEADERS = +include_linux_spidir = $(includedir)/linux/spi +include_linux_spi_HEADERS = +include_machinedir = $(includedir)/machine +include_machine_HEADERS = +include_mghttpddir = $(includedir)/mghttpd +include_mghttpd_HEADERS = +include_netdir = $(includedir)/net +include_net_HEADERS = +include_netinetdir = $(includedir)/netinet +include_netinet_HEADERS = +include_nfsdir = $(includedir)/nfs +include_nfs_HEADERS = +include_nfsclientdir = $(includedir)/nfsclient +include_nfsclient_HEADERS = +include_pcidir = $(includedir)/pci +include_pci_HEADERS = +include_rpcdir = $(includedir)/rpc +include_rpc_HEADERS = +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = +include_rtems_bfindir = $(includedir)/rtems/bfin +include_rtems_bfin_HEADERS = +include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet +include_rtems_bsdnet_HEADERS = +include_rtems_debuggerdir = $(includedir)/rtems/debugger +include_rtems_debugger_HEADERS = +include_rtems_m68kdir = $(includedir)/rtems/m68k +include_rtems_m68k_HEADERS = +include_rtems_mipsdir = $(includedir)/rtems/mips +include_rtems_mips_HEADERS = +include_rtems_posixdir = $(includedir)/rtems/posix +include_rtems_posix_HEADERS = +include_rtems_powerpcdir = $(includedir)/rtems/powerpc +include_rtems_powerpc_HEADERS = +include_rtems_rfsdir = $(includedir)/rtems/rfs +include_rtems_rfs_HEADERS = +include_rtems_rtemsdir = $(includedir)/rtems/rtems +include_rtems_rtems_HEADERS = +include_rtems_rtldir = $(includedir)/rtems/rtl +include_rtems_rtl_HEADERS = +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = +include_rtems_tracedir = $(includedir)/rtems/trace +include_rtems_trace_HEADERS = +include_sysdir = $(includedir)/sys +include_sys_HEADERS = +include_utf8procdir = $(includedir)/utf8proc +include_utf8proc_HEADERS = +include_uuiddir = $(includedir)/uuid +include_uuid_HEADERS = +include_vmdir = $(includedir)/vm +include_vm_HEADERS = diff --git a/cpukit/headers.am b/cpukit/headers.am index a848690e3a..3c5e7fe207 100644 --- a/cpukit/headers.am +++ b/cpukit/headers.am @@ -1,6 +1,4 @@ ## This file was generated by "./boostrap -H". - -include_HEADERS = include_HEADERS += include/aio.h include_HEADERS += include/crypt.h include_HEADERS += include/dlfcn.h @@ -22,13 +20,7 @@ include_HEADERS += include/sha512.h include_HEADERS += include/xz.h include_HEADERS += include/zconf.h include_HEADERS += include/zlib.h - -include_arpadir = $(includedir)/arpa -include_arpa_HEADERS = include_arpa_HEADERS += include/arpa/ftp.h - -include_dev_i2cdir = $(includedir)/dev/i2c -include_dev_i2c_HEADERS = include_dev_i2c_HEADERS += include/dev/i2c/eeprom.h include_dev_i2c_HEADERS += include/dev/i2c/fpga-i2c-slave.h include_dev_i2c_HEADERS += include/dev/i2c/gpio-nxp-pca9535.h @@ -39,34 +31,16 @@ include_dev_i2c_HEADERS += include/dev/i2c/ti-ads-16bit-adc.h include_dev_i2c_HEADERS += include/dev/i2c/ti-lm25066a.h include_dev_i2c_HEADERS += include/dev/i2c/ti-tmp112.h include_dev_i2c_HEADERS += include/dev/i2c/xilinx-axi-i2c.h - -include_dev_serialdir = $(includedir)/dev/serial -include_dev_serial_HEADERS = include_dev_serial_HEADERS += include/dev/serial/sc16is752.h - -include_dev_spidir = $(includedir)/dev/spi -include_dev_spi_HEADERS = include_dev_spi_HEADERS += include/dev/spi/spi.h - -include_drvmgrdir = $(includedir)/drvmgr -include_drvmgr_HEADERS = include_drvmgr_HEADERS += include/drvmgr/drvmgr.h include_drvmgr_HEADERS += include/drvmgr/drvmgr_confdefs.h include_drvmgr_HEADERS += include/drvmgr/drvmgr_list.h include_drvmgr_HEADERS += include/drvmgr/pci_bus.h - -include_linuxdir = $(includedir)/linux -include_linux_HEADERS = include_linux_HEADERS += include/linux/i2c-dev.h include_linux_HEADERS += include/linux/i2c.h include_linux_HEADERS += include/linux/rbtree.h - -include_linux_spidir = $(includedir)/linux/spi -include_linux_spi_HEADERS = include_linux_spi_HEADERS += include/linux/spi/spidev.h - -include_machinedir = $(includedir)/machine -include_machine_HEADERS = include_machine_HEADERS += include/machine/_kernel_cpuset.h include_machine_HEADERS += include/machine/_kernel_in.h include_machine_HEADERS += include/machine/_kernel_in6.h @@ -76,13 +50,7 @@ include_machine_HEADERS += include/machine/_kernel_time.h include_machine_HEADERS += include/machine/_kernel_types.h include_machine_HEADERS += include/machine/_kernel_uio.h include_machine_HEADERS += include/machine/_timecounter.h - -include_mghttpddir = $(includedir)/mghttpd -include_mghttpd_HEADERS = include_mghttpd_HEADERS += include/mghttpd/mongoose.h - -include_pcidir = $(includedir)/pci -include_pci_HEADERS = include_pci_HEADERS += include/pci/access.h include_pci_HEADERS += include/pci/cfg.h include_pci_HEADERS += include/pci/cfg_auto.h @@ -93,9 +61,6 @@ include_pci_HEADERS += include/pci/ids.h include_pci_HEADERS += include/pci/ids_extra.h include_pci_HEADERS += include/pci/irq.h include_pci_HEADERS += include/pci/pcireg.h - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = include_rtems_HEADERS += include/rtems/assoc.h include_rtems_HEADERS += include/rtems/bdbuf.h include_rtems_HEADERS += include/rtems/bdpart.h @@ -212,14 +177,8 @@ include_rtems_HEADERS += include/rtems/userenv.h include_rtems_HEADERS += include/rtems/version.h include_rtems_HEADERS += include/rtems/vmeintr.h include_rtems_HEADERS += include/rtems/watchdogdrv.h - -include_rtems_debuggerdir = $(includedir)/rtems/debugger -include_rtems_debugger_HEADERS = include_rtems_debugger_HEADERS += include/rtems/debugger/rtems-debugger-remote.h include_rtems_debugger_HEADERS += include/rtems/debugger/rtems-debugger-server.h - -include_rtems_posixdir = $(includedir)/rtems/posix -include_rtems_posix_HEADERS = include_rtems_posix_HEADERS += include/rtems/posix/aio_misc.h include_rtems_posix_HEADERS += include/rtems/posix/barrierimpl.h include_rtems_posix_HEADERS += include/rtems/posix/condimpl.h @@ -248,9 +207,6 @@ include_rtems_posix_HEADERS += include/rtems/posix/spinlockimpl.h include_rtems_posix_HEADERS += include/rtems/posix/threadsup.h include_rtems_posix_HEADERS += include/rtems/posix/timer.h include_rtems_posix_HEADERS += include/rtems/posix/timerimpl.h - -include_rtems_rfsdir = $(includedir)/rtems/rfs -include_rtems_rfs_HEADERS = include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-bitmaps.h include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-block-pos.h include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-block.h @@ -266,9 +222,6 @@ include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-inode.h include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-link.h include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-mutex.h include_rtems_rfs_HEADERS += include/rtems/rfs/rtems-rfs-trace.h - -include_rtems_rtemsdir = $(includedir)/rtems/rtems -include_rtems_rtems_HEADERS = include_rtems_rtems_HEADERS += include/rtems/rtems/asr.h include_rtems_rtems_HEADERS += include/rtems/rtems/asrimpl.h include_rtems_rtems_HEADERS += include/rtems/rtems/attr.h @@ -317,9 +270,6 @@ include_rtems_rtems_HEADERS += include/rtems/rtems/tasksimpl.h include_rtems_rtems_HEADERS += include/rtems/rtems/timer.h include_rtems_rtems_HEADERS += include/rtems/rtems/timerimpl.h include_rtems_rtems_HEADERS += include/rtems/rtems/types.h - -include_rtems_rtldir = $(includedir)/rtems/rtl -include_rtems_rtl_HEADERS = include_rtems_rtl_HEADERS += include/rtems/rtl/dlfcn-shell.h include_rtems_rtl_HEADERS += include/rtems/rtl/rap-shell.h include_rtems_rtl_HEADERS += include/rtems/rtl/rap.h @@ -334,9 +284,6 @@ include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-sym.h include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-trace.h include_rtems_rtl_HEADERS += include/rtems/rtl/rtl-unresolved.h include_rtems_rtl_HEADERS += include/rtems/rtl/rtl.h - -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = include_rtems_score_HEADERS += include/rtems/score/address.h include_rtems_score_HEADERS += include/rtems/score/apimutex.h include_rtems_score_HEADERS += include/rtems/score/assert.h @@ -438,13 +385,7 @@ include_rtems_score_HEADERS += include/rtems/score/userextimpl.h include_rtems_score_HEADERS += include/rtems/score/watchdog.h include_rtems_score_HEADERS += include/rtems/score/watchdogimpl.h include_rtems_score_HEADERS += include/rtems/score/wkspace.h - -include_rtems_tracedir = $(includedir)/rtems/trace -include_rtems_trace_HEADERS = include_rtems_trace_HEADERS += include/rtems/trace/rtems-trace-buffer-vars.h - -include_sysdir = $(includedir)/sys -include_sys_HEADERS = include_sys_HEADERS += include/sys/_ffcounter.h include_sys_HEADERS += include/sys/cdefs_elf.h include_sys_HEADERS += include/sys/endian.h @@ -458,11 +399,5 @@ include_sys_HEADERS += include/sys/timepps.h include_sys_HEADERS += include/sys/timetc.h include_sys_HEADERS += include/sys/timex.h include_sys_HEADERS += include/sys/utsname.h - -include_utf8procdir = $(includedir)/utf8proc -include_utf8proc_HEADERS = include_utf8proc_HEADERS += include/utf8proc/utf8proc.h - -include_uuiddir = $(includedir)/uuid -include_uuid_HEADERS = include_uuid_HEADERS += include/uuid/uuid.h diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am deleted file mode 100644 index dd7ee7ab31..0000000000 --- a/cpukit/libnetworking/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -if LIBNETWORKING -include $(srcdir)/headers.am -endif diff --git a/cpukit/libnetworking/headers.am b/cpukit/libnetworking/headers.am index 72eca05d9f..3d52fa216a 100644 --- a/cpukit/libnetworking/headers.am +++ b/cpukit/libnetworking/headers.am @@ -1,150 +1,125 @@ ## In contrast to the other headers.am files, this file must be maintained by ## hand. -include_HEADERS = -include_HEADERS += ifaddrs.h -include_HEADERS += librtemsNfs.h -include_HEADERS += loop.h -include_HEADERS += resolv.h +include_HEADERS += libnetworking/ifaddrs.h +include_HEADERS += libnetworking/librtemsNfs.h +include_HEADERS += libnetworking/loop.h +include_HEADERS += libnetworking/resolv.h -include_arpadir = $(includedir)/arpa -include_arpa_HEADERS = -include_arpa_HEADERS += arpa/nameser.h -include_arpa_HEADERS += arpa/nameser_compat.h +include_arpa_HEADERS += libnetworking/arpa/nameser.h +include_arpa_HEADERS += libnetworking/arpa/nameser_compat.h -include_dev_miidir = $(includedir)/dev/mii -include_dev_mii_HEADERS = -include_dev_mii_HEADERS += dev/mii/mii.h +include_dev_mii_HEADERS += libnetworking/dev/mii/mii.h -include_machinedir = $(includedir)/machine -include_machine_HEADERS = -include_machine_HEADERS += machine/_align.h -include_machine_HEADERS += machine/_kernel_if.h -include_machine_HEADERS += machine/_kernel_lock.h -include_machine_HEADERS += machine/_kernel_socket.h -include_machine_HEADERS += machine/cpu.h -include_machine_HEADERS += machine/cpufunc.h -include_machine_HEADERS += machine/in_cksum.h -include_machine_HEADERS += machine/limits.h -include_machine_HEADERS += machine/vmparam.h +include_machine_HEADERS += libnetworking/machine/_align.h +include_machine_HEADERS += libnetworking/machine/_kernel_if.h +include_machine_HEADERS += libnetworking/machine/_kernel_lock.h +include_machine_HEADERS += libnetworking/machine/_kernel_socket.h +include_machine_HEADERS += libnetworking/machine/cpu.h +include_machine_HEADERS += libnetworking/machine/cpufunc.h +include_machine_HEADERS += libnetworking/machine/in_cksum.h +include_machine_HEADERS += libnetworking/machine/limits.h +include_machine_HEADERS += libnetworking/machine/vmparam.h -include_netdir = $(includedir)/net -include_net_HEADERS = -include_net_HEADERS += net/bpf.h -include_net_HEADERS += net/ethernet.h -include_net_HEADERS += net/if_arp.h -include_net_HEADERS += net/if_dl.h -include_net_HEADERS += net/if_llc.h -include_net_HEADERS += net/if_media.h -include_net_HEADERS += net/if_ppp.h -include_net_HEADERS += net/if_pppvar.h -include_net_HEADERS += net/if_types.h -include_net_HEADERS += net/if_var.h -include_net_HEADERS += net/netisr.h -include_net_HEADERS += net/ppp_comp.h -include_net_HEADERS += net/ppp_defs.h -include_net_HEADERS += net/radix.h -include_net_HEADERS += net/raw_cb.h -include_net_HEADERS += net/route.h -include_net_HEADERS += net/slcompress.h +include_net_HEADERS += libnetworking/net/bpf.h +include_net_HEADERS += libnetworking/net/ethernet.h +include_net_HEADERS += libnetworking/net/if_arp.h +include_net_HEADERS += libnetworking/net/if_dl.h +include_net_HEADERS += libnetworking/net/if_llc.h +include_net_HEADERS += libnetworking/net/if_media.h +include_net_HEADERS += libnetworking/net/if_ppp.h +include_net_HEADERS += libnetworking/net/if_pppvar.h +include_net_HEADERS += libnetworking/net/if_types.h +include_net_HEADERS += libnetworking/net/if_var.h +include_net_HEADERS += libnetworking/net/netisr.h +include_net_HEADERS += libnetworking/net/ppp_comp.h +include_net_HEADERS += libnetworking/net/ppp_defs.h +include_net_HEADERS += libnetworking/net/radix.h +include_net_HEADERS += libnetworking/net/raw_cb.h +include_net_HEADERS += libnetworking/net/route.h +include_net_HEADERS += libnetworking/net/slcompress.h -include_netinetdir = $(includedir)/netinet -include_netinet_HEADERS = -include_netinet_HEADERS += netinet/icmp_var.h -include_netinet_HEADERS += netinet/if_ether.h -include_netinet_HEADERS += netinet/igmp.h -include_netinet_HEADERS += netinet/igmp_var.h -include_netinet_HEADERS += netinet/in_pcb.h -include_netinet_HEADERS += netinet/in_systm.h -include_netinet_HEADERS += netinet/in_var.h -include_netinet_HEADERS += netinet/ip.h -include_netinet_HEADERS += netinet/ip_fw.h -include_netinet_HEADERS += netinet/ip_icmp.h -include_netinet_HEADERS += netinet/ip_mroute.h -include_netinet_HEADERS += netinet/ip_var.h -include_netinet_HEADERS += netinet/tcp_debug.h -include_netinet_HEADERS += netinet/tcp_fsm.h -include_netinet_HEADERS += netinet/tcp_seq.h -include_netinet_HEADERS += netinet/tcp_timer.h -include_netinet_HEADERS += netinet/tcp_var.h -include_netinet_HEADERS += netinet/tcpip.h -include_netinet_HEADERS += netinet/udp.h -include_netinet_HEADERS += netinet/udp_var.h +include_netinet_HEADERS += libnetworking/netinet/icmp_var.h +include_netinet_HEADERS += libnetworking/netinet/if_ether.h +include_netinet_HEADERS += libnetworking/netinet/igmp.h +include_netinet_HEADERS += libnetworking/netinet/igmp_var.h +include_netinet_HEADERS += libnetworking/netinet/in_pcb.h +include_netinet_HEADERS += libnetworking/netinet/in_systm.h +include_netinet_HEADERS += libnetworking/netinet/in_var.h +include_netinet_HEADERS += libnetworking/netinet/ip.h +include_netinet_HEADERS += libnetworking/netinet/ip_fw.h +include_netinet_HEADERS += libnetworking/netinet/ip_icmp.h +include_netinet_HEADERS += libnetworking/netinet/ip_mroute.h +include_netinet_HEADERS += libnetworking/netinet/ip_var.h +include_netinet_HEADERS += libnetworking/netinet/tcp_debug.h +include_netinet_HEADERS += libnetworking/netinet/tcp_fsm.h +include_netinet_HEADERS += libnetworking/netinet/tcp_seq.h +include_netinet_HEADERS += libnetworking/netinet/tcp_timer.h +include_netinet_HEADERS += libnetworking/netinet/tcp_var.h +include_netinet_HEADERS += libnetworking/netinet/tcpip.h +include_netinet_HEADERS += libnetworking/netinet/udp.h +include_netinet_HEADERS += libnetworking/netinet/udp_var.h -include_nfsdir = $(includedir)/nfs -include_nfs_HEADERS = -include_nfs_HEADERS += nfs/nfsproto.h -include_nfs_HEADERS += nfs/rpcv2.h -include_nfs_HEADERS += nfs/xdr_subs.h +include_nfs_HEADERS += libnetworking/nfs/nfsproto.h +include_nfs_HEADERS += libnetworking/nfs/rpcv2.h +include_nfs_HEADERS += libnetworking/nfs/xdr_subs.h -include_nfsclientdir = $(includedir)/nfsclient -include_nfsclient_HEADERS = -include_nfsclient_HEADERS += nfsclient/nfsargs.h -include_nfsclient_HEADERS += nfsclient/nfsdiskless.h +include_nfsclient_HEADERS += libnetworking/nfsclient/nfsargs.h +include_nfsclient_HEADERS += libnetworking/nfsclient/nfsdiskless.h -include_rpcdir = $(includedir)/rpc -include_rpc_HEADERS = -include_rpc_HEADERS += rpc/auth.h -include_rpc_HEADERS += rpc/auth_unix.h -include_rpc_HEADERS += rpc/clnt.h -include_rpc_HEADERS += rpc/clnt_soc.h -include_rpc_HEADERS += rpc/clnt_stat.h -include_rpc_HEADERS += rpc/pmap_clnt.h -include_rpc_HEADERS += rpc/pmap_prot.h -include_rpc_HEADERS += rpc/pmap_rmt.h -include_rpc_HEADERS += rpc/rpc.h -include_rpc_HEADERS += rpc/rpc_com.h -include_rpc_HEADERS += rpc/rpc_msg.h -include_rpc_HEADERS += rpc/rpcent.h -include_rpc_HEADERS += rpc/svc.h -include_rpc_HEADERS += rpc/svc_auth.h -include_rpc_HEADERS += rpc/svc_soc.h -include_rpc_HEADERS += rpc/types.h -include_rpc_HEADERS += rpc/xdr.h +include_rpc_HEADERS += libnetworking/rpc/auth.h +include_rpc_HEADERS += libnetworking/rpc/auth_unix.h +include_rpc_HEADERS += libnetworking/rpc/clnt.h +include_rpc_HEADERS += libnetworking/rpc/clnt_soc.h +include_rpc_HEADERS += libnetworking/rpc/clnt_stat.h +include_rpc_HEADERS += libnetworking/rpc/pmap_clnt.h +include_rpc_HEADERS += libnetworking/rpc/pmap_prot.h +include_rpc_HEADERS += libnetworking/rpc/pmap_rmt.h +include_rpc_HEADERS += libnetworking/rpc/rpc.h +include_rpc_HEADERS += libnetworking/rpc/rpc_com.h +include_rpc_HEADERS += libnetworking/rpc/rpc_msg.h +include_rpc_HEADERS += libnetworking/rpc/rpcent.h +include_rpc_HEADERS += libnetworking/rpc/svc.h +include_rpc_HEADERS += libnetworking/rpc/svc_auth.h +include_rpc_HEADERS += libnetworking/rpc/svc_soc.h +include_rpc_HEADERS += libnetworking/rpc/types.h +include_rpc_HEADERS += libnetworking/rpc/xdr.h -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = -include_rtems_HEADERS += rtems/bootp.h -include_rtems_HEADERS += rtems/dhcp.h -include_rtems_HEADERS += rtems/mkrootfs.h -include_rtems_HEADERS += rtems/rtems_bsdnet.h -include_rtems_HEADERS += rtems/rtems_bsdnet_internal.h -include_rtems_HEADERS += rtems/rtems_dhcp_failsafe.h -include_rtems_HEADERS += rtems/rtems_mii_ioctl.h -include_rtems_HEADERS += rtems/rtems_netdb.h -include_rtems_HEADERS += rtems/rtems_netinet_in.h -include_rtems_HEADERS += rtems/rtems_syscall.h +include_rtems_HEADERS += libnetworking/rtems/bootp.h +include_rtems_HEADERS += libnetworking/rtems/dhcp.h +include_rtems_HEADERS += libnetworking/rtems/mkrootfs.h +include_rtems_HEADERS += libnetworking/rtems/rtems_bsdnet.h +include_rtems_HEADERS += libnetworking/rtems/rtems_bsdnet_internal.h +include_rtems_HEADERS += libnetworking/rtems/rtems_dhcp_failsafe.h +include_rtems_HEADERS += libnetworking/rtems/rtems_mii_ioctl.h +include_rtems_HEADERS += libnetworking/rtems/rtems_netdb.h +include_rtems_HEADERS += libnetworking/rtems/rtems_netinet_in.h +include_rtems_HEADERS += libnetworking/rtems/rtems_syscall.h -include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet -include_rtems_bsdnet_HEADERS = -include_rtems_bsdnet_HEADERS += rtems/bsdnet/_types.h -include_rtems_bsdnet_HEADERS += rtems/bsdnet/servers.h +include_rtems_bsdnet_HEADERS += libnetworking/rtems/bsdnet/_types.h +include_rtems_bsdnet_HEADERS += libnetworking/rtems/bsdnet/servers.h -include_sysdir = $(includedir)/sys -include_sys_HEADERS = -include_sys_HEADERS += sys/callout.h -include_sys_HEADERS += sys/conf.h -include_sys_HEADERS += sys/domain.h -include_sys_HEADERS += sys/kernel.h -include_sys_HEADERS += sys/libkern.h -include_sys_HEADERS += sys/linker_set.h -include_sys_HEADERS += sys/malloc.h -include_sys_HEADERS += sys/mbuf.h -include_sys_HEADERS += sys/mount.h -include_sys_HEADERS += sys/proc.h -include_sys_HEADERS += sys/protosw.h -include_sys_HEADERS += sys/reboot.h -include_sys_HEADERS += sys/resourcevar.h -include_sys_HEADERS += sys/selinfo.h -include_sys_HEADERS += sys/signalvar.h -include_sys_HEADERS += sys/socketvar.h -include_sys_HEADERS += sys/sysctl.h -include_sys_HEADERS += sys/systm.h -include_sys_HEADERS += sys/ucred.h +include_sys_HEADERS += libnetworking/sys/callout.h +include_sys_HEADERS += libnetworking/sys/conf.h +include_sys_HEADERS += libnetworking/sys/domain.h +include_sys_HEADERS += libnetworking/sys/kernel.h +include_sys_HEADERS += libnetworking/sys/libkern.h +include_sys_HEADERS += libnetworking/sys/linker_set.h +include_sys_HEADERS += libnetworking/sys/malloc.h +include_sys_HEADERS += libnetworking/sys/mbuf.h +include_sys_HEADERS += libnetworking/sys/mount.h +include_sys_HEADERS += libnetworking/sys/proc.h +include_sys_HEADERS += libnetworking/sys/protosw.h +include_sys_HEADERS += libnetworking/sys/reboot.h +include_sys_HEADERS += libnetworking/sys/resourcevar.h +include_sys_HEADERS += libnetworking/sys/selinfo.h +include_sys_HEADERS += libnetworking/sys/signalvar.h +include_sys_HEADERS += libnetworking/sys/socketvar.h +include_sys_HEADERS += libnetworking/sys/sysctl.h +include_sys_HEADERS += libnetworking/sys/systm.h +include_sys_HEADERS += libnetworking/sys/ucred.h -include_vmdir = $(includedir)/vm -include_vm_HEADERS = -include_vm_HEADERS += vm/vm.h -include_vm_HEADERS += vm/vm_extern.h -include_vm_HEADERS += vm/vm_kern.h -include_vm_HEADERS += vm/vm_param.h +include_vm_HEADERS += libnetworking/vm/vm.h +include_vm_HEADERS += libnetworking/vm/vm_extern.h +include_vm_HEADERS += libnetworking/vm/vm_kern.h +include_vm_HEADERS += libnetworking/vm/vm_param.h diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am deleted file mode 100644 index 1b048cbdce..0000000000 --- a/cpukit/score/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -include $(top_srcdir)/automake/multilib.am - -_SUBDIRS = cpu - -# This file is in the build tree -include_rtems_scoredir = $(includedir)/rtems/score -include_rtems_score_HEADERS = ../../include/rtems/score/cpuopts.h - -include $(top_srcdir)/automake/subdirs.am 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