summaryrefslogtreecommitdiffstats
path: root/cpukit/Makefile.am
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2017-12-23 18:18:56 +1100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-01-25 08:45:26 +0100
commit2afb22b7e1ebcbe40373ff7e0efae7d207c655a9 (patch)
tree44759efe9374f13200a97e96d91bd9a2b7e5ce2a /cpukit/Makefile.am
parentMAINTAINERS: Add myself to Write After Approval. (diff)
downloadrtems-2afb22b7e1ebcbe40373ff7e0efae7d207c655a9.tar.bz2
Remove make preinstall
A speciality of the RTEMS build system was the make preinstall step. It copied header files from arbitrary locations into the build tree. The header files were included via the -Bsome/build/tree/path GCC command line option. This has at least seven problems: * The make preinstall step itself needs time and disk space. * Errors in header files show up in the build tree copy. This makes it hard for editors to open the right file to fix the error. * There is no clear relationship between source and build tree header files. This makes an audit of the build process difficult. * The visibility of all header files in the build tree makes it difficult to enforce API barriers. For example it is discouraged to use BSP-specifics in the cpukit. * An introduction of a new build system is difficult. * Include paths specified by the -B option are system headers. This may suppress warnings. * The parallel build had sporadic failures on some hosts. This patch removes the make preinstall step. All installed header files are moved to dedicated include directories in the source tree. Let @RTEMS_CPU@ be the target architecture, e.g. arm, powerpc, sparc, etc. Let @RTEMS_BSP_FAMILIY@ be a BSP family base directory, e.g. erc32, imx, qoriq, etc. The new cpukit include directories are: * cpukit/include * cpukit/score/cpu/@RTEMS_CPU@/include * cpukit/libnetworking The new BSP include directories are: * bsps/include * bsps/@RTEMS_CPU@/include * bsps/@RTEMS_CPU@/@RTEMS_BSP_FAMILIY@/include There are build tree include directories for generated files. The include directory order favours the most general header file, e.g. it is not possible to override general header files via the include path order. The "bootstrap -p" option was removed. The new "bootstrap -H" option should be used to regenerate the "headers.am" files. Update #3254.
Diffstat (limited to 'cpukit/Makefile.am')
-rw-r--r--cpukit/Makefile.am227
1 files changed, 1 insertions, 226 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index d317fbba1c..636663e93e 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -29,292 +29,67 @@ _SUBDIRS += telnetd
_SUBDIRS += pppd
_SUBDIRS += mghttpd
-noinst_DATA = preinstall-stamp
-preinstall-stamp:
- $(MAKE) $(AM_MAKEFLAGS) preinstall
- touch preinstall-stamp
-CLEANFILES = preinstall-stamp
-
-include_HEADERS =
-include_HEADERS += include/endian.h
-include_HEADERS += include/zconf.h
-
-include_rtemsdir = $(includedir)/rtems
-include_rtems_HEADERS =
-
-include_rtems_rtemsdir = $(includedir)/rtems/rtems
-include_rtems_rtems_HEADERS =
-
-include_uuiddir = $(includedir)/uuid
-include_uuid_HEADERS = libmisc/uuid/uuid.h
-
-include_utf8procdir = $(includedir)/utf8proc
-include_utf8proc_HEADERS = libmisc/utf8proc/utf8proc.h
-
-include_sysdir = $(includedir)/sys
-include_sys_HEADERS =
-
-include_HEADERS += include/crypt.h
-include_HEADERS += include/memory.h
-
-include_HEADERS += libmisc/xz/xz.h
-
-include_sys_HEADERS += libcsupport/include/sys/event.h
-include_sys_HEADERS += libcsupport/include/sys/poll.h
-include_sys_HEADERS += libcsupport/include/sys/statvfs.h
-include_sys_HEADERS += libcsupport/include/sys/utsname.h
-
-include_sys_HEADERS += include/sys/endian.h
-include_sys_HEADERS += include/sys/priority.h
-
if LIBNETWORKING
-include_rtems_bsdnetdir = $(includedir)/rtems/bsdnet
-include_rtems_bsdnet_HEADERS = libnetworking/rtems/bsdnet/servers.h
-include_rtems_bsdnet_HEADERS += libnetworking/rtems/bsdnet/_types.h
endif
if LIBDL
-include_HEADERS += libdl/dlfcn.h
-include_HEADERS += libdl/include/link.h
-include_HEADERS += libdl/include/link_elf.h
-include_sys_HEADERS += libdl/include/sys/cdefs_elf.h
-include_sys_HEADERS += libdl/include/sys/exec_elf.h
-include_arch_machinedir = $(includedir)/machine
-include_arch_machine_HEADERS =
-include_arch_machine_HEADERS += libdl/include/arch/@RTEMS_CPU@/machine/elf_machdep.h
-include_rtems_rtldir = $(includedir)/rtems/rtl
-include_rtems_rtl_HEADERS =
-include_rtems_rtl_HEADERS += libdl/dlfcn-shell.h
-include_rtems_rtl_HEADERS += libdl/rtl.h libdl/rtl-allocator.h libdl/rtl-obj-fwd.h
-include_rtems_rtl_HEADERS += libdl/rtl-fwd.h libdl/rtl-obj.h libdl/rtl-obj-cache.h
-include_rtems_rtl_HEADERS += libdl/rtl-obj-comp.h libdl/rtl-unresolved.h
-include_rtems_rtl_HEADERS += libdl/rtl-indirect-ptr.h libdl/rtl-sym.h libdl/rtl-trace.h
-include_rtems_rtl_HEADERS += libdl/rap.h libdl/rap-shell.h
endif
if LIBDEBUGGER
-include_rtems_HEADERS += libdebugger/rtems-debugger.h
-include_rtems_debuggerdir = $(includedir)/rtems/debugger
-include_rtems_debugger_HEADERS =
-include_rtems_debugger_HEADERS += libdebugger/rtems-debugger-server.h
-include_rtems_debugger_HEADERS += libdebugger/rtems-debugger-remote.h
endif
-include_rtems_HEADERS += include/rtems/bspIo.h
-include_rtems_HEADERS += include/rtems/inttypes.h
-include_rtems_HEADERS += include/rtems/print.h
-include_rtems_HEADERS += include/rtems/printer.h
-include_rtems_HEADERS += include/rtems/userenv.h
-include_rtems_HEADERS += include/rtems/fs.h
if !LIBPCI
-include_rtems_HEADERS += include/rtems/pci.h
endif
-include_rtems_HEADERS += include/rtems/concat.h
-include_rtems_HEADERS += include/rtems/status-checks.h
-
-include_rtems_HEADERS += include/rtems/endian.h
-
-include_rtems_HEADERS += include/rtems/btimer.h
-include_rtems_HEADERS += include/rtems/console.h
-include_rtems_HEADERS += include/rtems/clockdrv.h
-include_rtems_HEADERS += include/rtems/framebuffer.h
-include_rtems_HEADERS += include/rtems/rtc.h
-include_rtems_HEADERS += include/rtems/watchdogdrv.h
-
## should be conditional and only installed for PowerPC, x86, and ARM
-include_rtems_HEADERS += include/rtems/irq.h
-
-include_rtems_HEADERS += include/rtems/irq-extension.h
-
## libfs
-include_rtems_HEADERS += libfs/src/imfs/imfs.h
-
## POSIX FIFO/pipe
-include_rtems_HEADERS += libfs/src/pipe/pipe.h
-
## devfs
-include_rtems_HEADERS += libfs/src/devfs/devfs.h
-
if LIBDOSFS
-include_rtems_HEADERS += libfs/src/dosfs/dosfs.h
endif
# RFS
-include_rtems_HEADERS += libfs/src/rfs/rtems-rfs.h
-include_rtems_HEADERS += libfs/src/rfs/rtems-rfs-format.h
-include_rtems_HEADERS += libfs/src/rfs/rtems-rfs-shell.h
-
-include_rtems_rfsdir = $(include_rtemsdir)/rfs
-include_rtems_rfs_HEADERS =
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-bitmaps.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-block-pos.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-block.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-buffer.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-data.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-dir.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-dir-hash.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file-system-fwd.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-file-system.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-group.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-inode.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-link.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-mutex.h
-include_rtems_rfs_HEADERS += libfs/src/rfs/rtems-rfs-trace.h
-
# JFFS2
-include_rtems_HEADERS += libfs/src/jffs2/include/rtems/jffs2.h
-
## libblock
-include_rtems_HEADERS += libblock/include/rtems/bdbuf.h
-include_rtems_HEADERS += libblock/include/rtems/blkdev.h
-include_rtems_HEADERS += libblock/include/rtems/diskdevs.h
-include_rtems_HEADERS += libblock/include/rtems/flashdisk.h
-include_rtems_HEADERS += libblock/include/rtems/ramdisk.h
-include_rtems_HEADERS += libblock/include/rtems/nvdisk.h
-include_rtems_HEADERS += libblock/include/rtems/nvdisk-sram.h
-include_rtems_HEADERS += libblock/include/rtems/sparse-disk.h
-include_rtems_HEADERS += libblock/include/rtems/ide_part_table.h
-include_rtems_HEADERS += libblock/include/rtems/bdpart.h
-include_rtems_HEADERS += libblock/include/rtems/media.h
-
## ftpd
if LIBNETWORKING
-include_rtems_HEADERS += ftpd/ftpd.h
endif
## bspcmdline
-include_rtems_HEADERS += libmisc/bspcmdline/bspcmdline.h
-
## capture
-include_rtems_HEADERS += libmisc/capture/capture.h
-include_rtems_HEADERS += libmisc/capture/capture-cli.h
-include_rtems_HEADERS += libmisc/capture/captureimpl.h
-
# tracing headers
-include_rtems_tracedir = $(include_rtemsdir)/trace
-include_rtems_trace_HEADERS =
-include_rtems_trace_HEADERS += libmisc/capture/rtems-trace-buffer-vars.h
-
## cpuuse
-include_rtems_HEADERS += libmisc/cpuuse/cpuuse.h
-
## devnull
-include_rtems_HEADERS += libmisc/devnull/devnull.h
-include_rtems_HEADERS += libmisc/devnull/devzero.h
-
## dumpbuf
-include_rtems_HEADERS += libmisc/dumpbuf/dumpbuf.h
-
## rtemsfdt
-include_rtems_HEADERS += libmisc/rtems-fdt/rtems-fdt.h
-include_rtems_HEADERS += libmisc/rtems-fdt/rtems-fdt-shell.h
-
## monitor
-include_rtems_HEADERS += libmisc/monitor/monitor.h
-
## fb
-include_rtems_HEADERS += libmisc/fb/fb.h
-include_rtems_HEADERS += libmisc/fb/mw_uid.h
-
## mouse
-include_rtems_HEADERS += libmisc/mouse/mouse_parser.h
-include_rtems_HEADERS += libmisc/mouse/serial_mouse.h
-
## libqos
-include_rtems_HEADERS += libqos/qreslib.h
-
## redirector
-include_rtems_HEADERS += libmisc/redirector/stdio-redirect.h
## shell
if LIBSHELL
-include_rtems_HEADERS += libmisc/shell/shell.h
-include_rtems_HEADERS += libmisc/shell/shellconfig.h
endif
## stringto
-include_rtems_HEADERS += libmisc/stringto/stringto.h
-
## testsupport
-include_rtems_HEADERS += libmisc/testsupport/test.h
-
## i2c
-include_rtems_HEADERS += libi2c/libi2c.h
-
## serdbg
if LIBSERDBG
-include_rtems_HEADERS += libmisc/serdbg/serdbgcnf.h
-include_rtems_HEADERS += libmisc/serdbg/serdbg.h
-include_rtems_HEADERS += libmisc/serdbg/termios_printk_cnf.h
-include_rtems_HEADERS += libmisc/serdbg/termios_printk.h
endif
## stackchk
-include_rtems_HEADERS += libmisc/stackchk/stackchk.h
-
## libuntar
-include_rtems_HEADERS += libmisc/untar/untar.h
-
## fsmount
-include_rtems_HEADERS += libmisc/fsmount/fsmount.h
-
-include_rtems_HEADERS += include/rtems/tm27-default.h
-
## Driver manager
if LIBDRVMGR
-include_drvmgrdir = $(includedir)/drvmgr
-include_drvmgr_HEADERS = libdrvmgr/drvmgr.h
-include_drvmgr_HEADERS += libdrvmgr/drvmgr_confdefs.h
-include_drvmgr_HEADERS += libdrvmgr/drvmgr_list.h
endif
if LIBGNAT
-include_adaincludedir = $(includedir)/adainclude
-include_adainclude_HEADERS =
-include_adainclude_HEADERS += include/adainclude/rtems.adb
-include_adainclude_HEADERS += include/adainclude/rtems.ads
-include_adainclude_HEADERS += include/adainclude/rtems-barrier.adb
-include_adainclude_HEADERS += include/adainclude/rtems-barrier.ads
-include_adainclude_HEADERS += include/adainclude/rtems-clock.adb
-include_adainclude_HEADERS += include/adainclude/rtems-clock.ads
-include_adainclude_HEADERS += include/adainclude/rtems-cpu_usage.ads
-include_adainclude_HEADERS += include/adainclude/rtems-event.adb
-include_adainclude_HEADERS += include/adainclude/rtems-event.ads
-include_adainclude_HEADERS += include/adainclude/rtems-extension.adb
-include_adainclude_HEADERS += include/adainclude/rtems-extension.ads
-include_adainclude_HEADERS += include/adainclude/rtems-fatal.adb
-include_adainclude_HEADERS += include/adainclude/rtems-fatal.ads
-include_adainclude_HEADERS += include/adainclude/rtems-interrupt.ads
-include_adainclude_HEADERS += include/adainclude/rtems-io.adb
-include_adainclude_HEADERS += include/adainclude/rtems-io.ads
-include_adainclude_HEADERS += include/adainclude/rtems-message_queue.adb
-include_adainclude_HEADERS += include/adainclude/rtems-message_queue.ads
-include_adainclude_HEADERS += include/adainclude/rtems-multiprocessing.adb
-include_adainclude_HEADERS += include/adainclude/rtems-multiprocessing.ads
-include_adainclude_HEADERS += include/adainclude/rtems-object.adb
-include_adainclude_HEADERS += include/adainclude/rtems-object.ads
-include_adainclude_HEADERS += include/adainclude/rtems-partition.adb
-include_adainclude_HEADERS += include/adainclude/rtems-partition.ads
-include_adainclude_HEADERS += include/adainclude/rtems-port.adb
-include_adainclude_HEADERS += include/adainclude/rtems-port.ads
-include_adainclude_HEADERS += include/adainclude/rtems-rate_monotonic.adb
-include_adainclude_HEADERS += include/adainclude/rtems-rate_monotonic.ads
-include_adainclude_HEADERS += include/adainclude/rtems-region.adb
-include_adainclude_HEADERS += include/adainclude/rtems-region.ads
-include_adainclude_HEADERS += include/adainclude/rtems-semaphore.adb
-include_adainclude_HEADERS += include/adainclude/rtems-semaphore.ads
-include_adainclude_HEADERS += include/adainclude/rtems-signal.adb
-include_adainclude_HEADERS += include/adainclude/rtems-signal.ads
-include_adainclude_HEADERS += include/adainclude/rtems-stack_checker.ads
-include_adainclude_HEADERS += include/adainclude/rtems-tasks.adb
-include_adainclude_HEADERS += include/adainclude/rtems-tasks.ads
-include_adainclude_HEADERS += include/adainclude/rtems-timer.adb
-include_adainclude_HEADERS += include/adainclude/rtems-timer.ads
endif
## HACK: doxygen filter.
EXTRA_DIST = doxy-filter
-include $(srcdir)/preinstall.am
include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/local.am
+include $(srcdir)/headers.am