diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-03-27 14:23:52 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-03-27 15:38:25 +0200 |
commit | 5f382713904a1eff309457311d29b4b84798e83b (patch) | |
tree | 4ba24f5e2721a7380219f8f105fa16b50adf5aca | |
parent | bsp/qoriq: Regenerate preinstall.am (diff) | |
download | rtems-5f382713904a1eff309457311d29b4b84798e83b.tar.bz2 |
cpukit: Fix Makefile.am and update preinstall.am
Update #2897.
-rw-r--r-- | cpukit/Makefile.am | 8 | ||||
-rw-r--r-- | cpukit/preinstall.am | 30 |
2 files changed, 20 insertions, 18 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index cb46f20ce1..755bc1173a 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -59,15 +59,17 @@ include_sys_HEADERS = include_HEADERS += include/crypt.h include_HEADERS += include/memory.h -include_sys_HEADERS += libcsupport/include/sys/ioccom.h include_sys_HEADERS += libcsupport/include/sys/event.h include_sys_HEADERS += libcsupport/include/sys/filio.h +include_sys_HEADERS += libcsupport/include/sys/ioccom.h include_sys_HEADERS += libcsupport/include/sys/ioctl.h include_sys_HEADERS += libcsupport/include/sys/poll.h -include_sys_HEADERS += libcsupport/include/sys/statvfs.h include_sys_HEADERS += libcsupport/include/sys/sockio.h -include_sys_HEADERS += libcsupport/include/sys/ttycom.h +include_sys_HEADERS += libcsupport/include/sys/statvfs.h +include_sys_HEADERS += libcsupport/include/sys/_termios.h include_sys_HEADERS += libcsupport/include/sys/termios.h +include_sys_HEADERS += libcsupport/include/sys/ttycom.h +include_sys_HEADERS += libcsupport/include/sys/ttydefaults.h include_sys_HEADERS += libcsupport/include/sys/utsname.h include_sys_HEADERS += include/sys/endian.h diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am index 53f78f3499..598d034f9f 100644 --- a/cpukit/preinstall.am +++ b/cpukit/preinstall.am @@ -72,10 +72,6 @@ $(PROJECT_INCLUDE)/memory.h: include/memory.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/memory.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/memory.h -$(PROJECT_INCLUDE)/sys/ioccom.h: libcsupport/include/sys/ioccom.h $(PROJECT_INCLUDE)/sys/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioccom.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ioccom.h - $(PROJECT_INCLUDE)/sys/event.h: libcsupport/include/sys/event.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/event.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/event.h @@ -84,6 +80,10 @@ $(PROJECT_INCLUDE)/sys/filio.h: libcsupport/include/sys/filio.h $(PROJECT_INCLUD $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/filio.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/filio.h +$(PROJECT_INCLUDE)/sys/ioccom.h: libcsupport/include/sys/ioccom.h $(PROJECT_INCLUDE)/sys/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioccom.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ioccom.h + $(PROJECT_INCLUDE)/sys/ioctl.h: libcsupport/include/sys/ioctl.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioctl.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ioctl.h @@ -92,21 +92,13 @@ $(PROJECT_INCLUDE)/sys/poll.h: libcsupport/include/sys/poll.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/poll.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/poll.h -$(PROJECT_INCLUDE)/sys/statvfs.h: libcsupport/include/sys/statvfs.h $(PROJECT_INCLUDE)/sys/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/statvfs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/statvfs.h - $(PROJECT_INCLUDE)/sys/sockio.h: libcsupport/include/sys/sockio.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/sockio.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/sockio.h -$(PROJECT_INCLUDE)/sys/ttycom.h: libcsupport/include/sys/ttycom.h $(PROJECT_INCLUDE)/sys/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ttycom.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ttycom.h - -$(PROJECT_INCLUDE)/sys/ttydefaults.h: libcsupport/include/sys/ttydefaults.h $(PROJECT_INCLUDE)/sys/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ttydefaults.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ttydefaults.h +$(PROJECT_INCLUDE)/sys/statvfs.h: libcsupport/include/sys/statvfs.h $(PROJECT_INCLUDE)/sys/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/statvfs.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/statvfs.h $(PROJECT_INCLUDE)/sys/_termios.h: libcsupport/include/sys/_termios.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/_termios.h @@ -116,6 +108,14 @@ $(PROJECT_INCLUDE)/sys/termios.h: libcsupport/include/sys/termios.h $(PROJECT_IN $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/termios.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/termios.h +$(PROJECT_INCLUDE)/sys/ttycom.h: libcsupport/include/sys/ttycom.h $(PROJECT_INCLUDE)/sys/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ttycom.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ttycom.h + +$(PROJECT_INCLUDE)/sys/ttydefaults.h: libcsupport/include/sys/ttydefaults.h $(PROJECT_INCLUDE)/sys/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ttydefaults.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ttydefaults.h + $(PROJECT_INCLUDE)/sys/utsname.h: libcsupport/include/sys/utsname.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/utsname.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/utsname.h |