Changeset b24b4eb in rtems


Ignore:
Timestamp:
Oct 29, 2004, 10:13:02 AM (15 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
ec75ddc
Parents:
9fcf77a
Message:

2004-10-28 Ralf Corsepius <ralf_corsepius@…>

  • libcsupport/include/rtems/_inttypes.h: Remove.
  • libcsupport/include/rtems/_stdint.h: Remove.
  • libcsupport/include/sys/_inttypes.h: New.
  • libcsupport/include/sys/_stdint.h: New.
  • libcsupport/Makefile.am: Reflect changes above.
Location:
cpukit
Files:
2 added
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r9fcf77a rb24b4eb  
     12004-10-28      Ralf Corsepius <ralf_corsepius@rtems.org>
     2
     3        * libcsupport/include/rtems/_inttypes.h: Remove.
     4        * libcsupport/include/rtems/_stdint.h: Remove.
     5        * libcsupport/include/sys/_inttypes.h: New.
     6        * libcsupport/include/sys/_stdint.h: New.
     7        * libcsupport/Makefile.am: Reflect changes above.
     8
    192004-10-28      Ralf Corsepius <ralf_corsepius@rtems.org>
    210
  • cpukit/libcsupport/Makefile.am

    r9fcf77a rb24b4eb  
    2323include_HEADERS =
    2424
    25 if NEWLIB
     25#if NEWLIB
     26include_sysdir = $(includedir)/sys
     27include_sys_HEADERS =
     28
     29if RTEMS_PROVIDES_STDINT_H
    2630include_HEADERS += include/stdint.h
     31include_sys_HEADERS += include/sys/_stdint.h
     32endif
     33
     34if RTEMS_PROVIDES_INTTYPES_H
    2735include_HEADERS += include/inttypes.h
    28 include_rtems_HEADERS += include/rtems/_stdint.h
    29 include_rtems_HEADERS += include/rtems/_inttypes.h
    30 endif
     36include_sys_HEADERS += include/sys/_inttypes.h
     37endif
     38#endif
    3139
    3240## motorola
     
    4553
    4654if NEWLIB
    47 include_sysdir = $(includedir)/sys
    48 include_sys_HEADERS = include/sys/ioccom.h include/sys/filio.h \
     55include_sys_HEADERS += include/sys/ioccom.h include/sys/filio.h \
    4956    include/sys/ioctl.h include/sys/sockio.h include/sys/ttycom.h \
    5057    include/sys/termios.h include/sys/utsname.h include/sys/cdefs.h
     
    123130DISTCLEANFILES =
    124131
     132libcsupport/include/sys/$(dirstamp):
     133        @$(mkdir_p) libcsupport/include/sys
     134        @: > libcsupport/include/sys/$(dirstamp)
     135
     136if RTEMS_PROVIDES_STDINT_H
     137
     138libcsupport/include/sys/_stdint.h: include/sys/_stdint.h libcsupport/include/sys/$(dirstamp)
     139        $(INSTALL_DATA) $< libcsupport/include/sys/_stdint.h
     140endif
     141
     142if RTEMS_PROVIDES_INTTYPES_H
     143
     144libcsupport/include/sys/_inttypes.h: include/sys/_inttypes.h libcsupport/include/sys/$(dirstamp)
     145        $(INSTALL_DATA) $< libcsupport/include/sys/_inttypes.h
     146endif
     147
     148if NEWLIB
     149libcsupport/include/sys/ioccom.h: include/sys/ioccom.h libcsupport/include/sys/$(dirstamp)
     150        $(INSTALL_DATA) $< libcsupport/include/sys/ioccom.h
     151
     152libcsupport/include/sys/filio.h: include/sys/filio.h libcsupport/include/sys/$(dirstamp)
     153        $(INSTALL_DATA) $< libcsupport/include/sys/filio.h
     154
     155libcsupport/include/sys/ioctl.h: include/sys/ioctl.h libcsupport/include/sys/$(dirstamp)
     156        $(INSTALL_DATA) $< libcsupport/include/sys/ioctl.h
     157
     158libcsupport/include/sys/sockio.h: include/sys/sockio.h libcsupport/include/sys/$(dirstamp)
     159        $(INSTALL_DATA) $< libcsupport/include/sys/sockio.h
     160
     161libcsupport/include/sys/ttycom.h: include/sys/ttycom.h libcsupport/include/sys/$(dirstamp)
     162        $(INSTALL_DATA) $< libcsupport/include/sys/ttycom.h
     163
     164libcsupport/include/sys/termios.h: include/sys/termios.h libcsupport/include/sys/$(dirstamp)
     165        $(INSTALL_DATA) $< libcsupport/include/sys/termios.h
     166
     167libcsupport/include/sys/utsname.h: include/sys/utsname.h libcsupport/include/sys/$(dirstamp)
     168        $(INSTALL_DATA) $< libcsupport/include/sys/utsname.h
     169
     170libcsupport/include/sys/cdefs.h: include/sys/cdefs.h libcsupport/include/sys/$(dirstamp)
     171        $(INSTALL_DATA) $< libcsupport/include/sys/cdefs.h
     172endif
     173
    125174PREINSTALL_DIRS =
    126175PREINSTALL_FILES =
     
    172221PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/vmeintr.h
    173222
    174 if NEWLIB
     223$(PROJECT_INCLUDE)/sys/$(dirstamp):
     224        @$(mkdir_p) $(PROJECT_INCLUDE)/sys
     225        @: > $(PROJECT_INCLUDE)/sys/$(dirstamp)
     226PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sys/$(dirstamp)
     227
     228if RTEMS_PROVIDES_STDINT_H
    175229$(PROJECT_INCLUDE)/stdint.h: include/stdint.h $(PROJECT_INCLUDE)/$(dirstamp)
    176230        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/stdint.h
    177231PREINSTALL_FILES += $(PROJECT_INCLUDE)/stdint.h
    178232
     233$(PROJECT_INCLUDE)/sys/_stdint.h: include/sys/_stdint.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
     234        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/_stdint.h
     235PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/_stdint.h
     236endif
     237
     238if RTEMS_PROVIDES_INTTYPES_H
    179239$(PROJECT_INCLUDE)/inttypes.h: include/inttypes.h $(PROJECT_INCLUDE)/$(dirstamp)
    180240        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/inttypes.h
    181241PREINSTALL_FILES += $(PROJECT_INCLUDE)/inttypes.h
    182242
    183 $(PROJECT_INCLUDE)/rtems/_stdint.h: include/rtems/_stdint.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    184         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/_stdint.h
    185 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/_stdint.h
    186 
    187 $(PROJECT_INCLUDE)/rtems/_inttypes.h: include/rtems/_inttypes.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
    188         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/_inttypes.h
    189 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/_inttypes.h
     243$(PROJECT_INCLUDE)/sys/_inttypes.h: include/sys/_inttypes.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
     244        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/_inttypes.h
     245PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/_inttypes.h
    190246endif
    191247
     
    232288
    233289if NEWLIB
    234 $(PROJECT_INCLUDE)/sys/$(dirstamp):
    235         @$(mkdir_p) $(PROJECT_INCLUDE)/sys
    236         @: > $(PROJECT_INCLUDE)/sys/$(dirstamp)
    237 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sys/$(dirstamp)
    238 
    239290$(PROJECT_INCLUDE)/sys/ioccom.h: include/sys/ioccom.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
    240291        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioccom.h
Note: See TracChangeset for help on using the changeset viewer.