diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-14 13:21:06 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-14 13:21:06 +0000 |
| commit | 6dc747080e0c47d8443699c62162a1b016886137 (patch) | |
| tree | 6f2a1a9fc10717bfc3b021474e2535b23e2c3bb1 /cpukit | |
| parent | 2004-04-14 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-6dc747080e0c47d8443699c62162a1b016886137.tar.bz2 | |
2004-04-14 Ralf Corsepius <ralf_corsepius@rtems.org>
* libcsupport/Makefile.am: Install include_sys_HEADERS for NEWLIB
only. Merge sys/cdefs.h into general include_sys_HEADERS.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/libcsupport/Makefile.am | 17 |
2 files changed, 9 insertions, 13 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index ed7cd1c831..b4c5067f9a 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2004-04-14 Ralf Corsepius <ralf_corsepius@rtems.org> + + * libcsupport/Makefile.am: Install include_sys_HEADERS for NEWLIB + only. Merge sys/cdefs.h into general include_sys_HEADERS. + 2004-04-13 Ralf Corsepius <ralf_corsepius@rtems.org> * rtems/include/rtems/rtems/types.h: Include <rtems/stdint.h> diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index 933c773dcc..91c33808ae 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -41,18 +41,11 @@ include_rtems_HEADERS += include/rtems/assoc.h include/rtems/error.h \ ## sys -include_sysdir = $(includedir)/sys - -include_sys_HEADERS = - if NEWLIB -include_sys_HEADERS += include/sys/ioccom.h include/sys/filio.h \ +include_sysdir = $(includedir)/sys +include_sys_HEADERS = include/sys/ioccom.h include/sys/filio.h \ include/sys/ioctl.h include/sys/sockio.h include/sys/ttycom.h \ - include/sys/termios.h include/sys/utsname.h -endif - -if NEED_SYS_CDEFS_H -include_sys_HEADERS += include/sys/cdefs.h + include/sys/termios.h include/sys/utsname.h include/sys/cdefs.h endif ## zilog @@ -227,12 +220,12 @@ $(PROJECT_INCLUDE)/rtems/cdefs.h: include/rtems/cdefs.h $(PROJECT_INCLUDE)/rtems $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/cdefs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/cdefs.h +if NEWLIB $(PROJECT_INCLUDE)/sys/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/sys @: > $(PROJECT_INCLUDE)/sys/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sys/$(dirstamp) -if NEWLIB $(PROJECT_INCLUDE)/sys/ioccom.h: include/sys/ioccom.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioccom.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ioccom.h @@ -260,9 +253,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/termios.h $(PROJECT_INCLUDE)/sys/utsname.h: include/sys/utsname.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/utsname.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/utsname.h -endif -if NEED_SYS_CDEFS_H $(PROJECT_INCLUDE)/sys/cdefs.h: include/sys/cdefs.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/cdefs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/cdefs.h |