Changeset deb66d1 in rtems


Ignore:
Timestamp:
May 14, 2002, 6:46:05 PM (18 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
baf71338
Parents:
dc7fb59b
Message:

2002-05-03 Ralf Corsepius <corsepiu@…>

  • include/Makefile.am: Remove.
  • include/sys/utsname.h: Added, removed times (now in newlib).
  • Makefile.am: Merge include/Makefile.am
  • libc/utsname.c: Relocated from posix/src.
  • libc/Makefile.am: Reflect changes above.
  • configure.ac: Remove include/Makefile
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/libcsupport/Makefile.am

    rdc7fb59b rdeb66d1  
    55ACLOCAL_AMFLAGS = -I ../../../aclocal
    66
    7 SUBDIRS = include libc
     7include $(top_srcdir)/../../../automake/multilib.am
     8
     9SUBDIRS = . libc
     10
     11include_HEADERS = include/chain.h include/console.h include/clockdrv.h \
     12    include/iosupp.h include/ringbuf.h include/rtc.h \
     13    include/spurious.h include/timerdrv.h include/vmeintr.h
     14
     15LIBC_HFILES = include/stdint.h include/inttypes.h
     16include_HEADERS += $(LIBC_HFILES)
     17
     18PREINSTALL_FILES = $(PROJECT_INCLUDE) \
     19    $(include_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     20
     21$(PROJECT_INCLUDE):
     22        @$(mkinstalldirs) $@
     23$(PROJECT_INCLUDE)/motorola:
     24        @$(mkinstalldirs) $@
     25$(PROJECT_INCLUDE)/rtems:
     26        @$(mkinstalldirs) $@
     27$(PROJECT_INCLUDE)/sys:
     28        @$(mkinstalldirs) $@
     29$(PROJECT_INCLUDE)/zilog:
     30        @$(mkinstalldirs) $@
     31
     32$(PROJECT_INCLUDE)/%.h: include/%.h
     33        $(INSTALL_DATA) $< $@
     34
     35## motorola
     36
     37include_motoroladir = $(includedir)/motorola
     38
     39include_motorola_HEADERS = include/motorola/mc68230.h include/motorola/mc68681.h
     40
     41PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \
     42    $(include_motorola_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     43
     44## rtems
     45include_rtemsdir = $(includedir)/rtems
     46
     47include_rtems_HEADERS = \
     48    include/rtems/assoc.h include/rtems/error.h include/rtems/libcsupport.h \
     49    include/rtems/libio.h include/rtems/libio_.h \
     50    include/rtems/termiostypes.h
     51
     52PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
     53    $(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     54
     55## sys
     56
     57include_sysdir = $(includedir)/sys
     58
     59if !HAS_NETWORKING
     60NETWORKING_H_FILES = include/sys/ioctl.h
     61endif
     62
     63if NEWLIB
     64NEWLIB_H_FILES = include/sys/termios.h include/sys/cdefs.h include/sys/utsname.h
     65endif
     66
     67include_sys_HEADERS = \
     68include/sys/ioccom.h \
     69include/sys/ttycom.h \
     70include/sys/utime.h \
     71$(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
     72
     73PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
     74    $(include_sys_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     75
     76## zilog
     77
     78include_zilogdir = $(includedir)/zilog
     79
     80include_zilog_HEADERS = include/zilog/z8036.h include/zilog/z8530.h \
     81    include/zilog/z8536.h
     82
     83PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \
     84    $(include_zilog_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     85
     86##  General stuff
     87all-local: $(PREINSTALL_FILES)
    888
    989include $(top_srcdir)/../../../automake/subdirs.am
  • c/src/exec/libcsupport/configure.ac

    rdc7fb59b rdeb66d1  
    3636# Explicitly list all Makefiles here
    3737AC_CONFIG_FILES([Makefile
    38 include/Makefile
    3938libc/Makefile])
    4039AC_OUTPUT
  • c/src/exec/libcsupport/src/Makefile.am

    rdc7fb59b rdeb66d1  
    33##
    44
     5include $(top_srcdir)/../../../automake/multilib.am
     6include $(top_srcdir)/../../../automake/compile.am
     7include $(top_srcdir)/../../../automake/lib.am
    58
    69LIBNAME = libcsupport
     
    3740
    3841LIBC_GLUE_C_FILES = __getpid.c __gettod.c __times.c truncate.c access.c \
    39     stat.c lstat.c pathconf.c newlibc.c no_posix.c no_libc.c
     42    stat.c lstat.c pathconf.c newlibc.c no_posix.c no_libc.c utsname.c
    4043
    4144UNIX_LIBC_C_FILES = unixlibc.c hosterr.c
     
    5760endif
    5861C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
    59 
    60 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    61 include $(top_srcdir)/../../../automake/compile.am
    62 include $(top_srcdir)/../../../automake/lib.am
    6362
    6463TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
  • c/src/lib/ChangeLog

    rdc7fb59b rdeb66d1  
     12002-05-03      Ralf Corsepius <corsepiu@faw.uni-ulm.de>       
     2
     3        * include/Makefile.am: Remove.
     4        * include/sys/utsname.h: Added, removed times (now in newlib).
     5        * Makefile.am: Merge include/Makefile.am
     6
     7        * libc/utsname.c: Relocated from posix/src.
     8        * libc/Makefile.am: Reflect changes above.
     9
     10        * configure.ac: Remove include/Makefile
     11
    1122002-05-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    213
  • c/src/lib/Makefile.am

    rdc7fb59b rdeb66d1  
    55ACLOCAL_AMFLAGS = -I ../../../aclocal
    66
    7 SUBDIRS = include libc
     7include $(top_srcdir)/../../../automake/multilib.am
     8
     9SUBDIRS = . libc
     10
     11include_HEADERS = include/chain.h include/console.h include/clockdrv.h \
     12    include/iosupp.h include/ringbuf.h include/rtc.h \
     13    include/spurious.h include/timerdrv.h include/vmeintr.h
     14
     15LIBC_HFILES = include/stdint.h include/inttypes.h
     16include_HEADERS += $(LIBC_HFILES)
     17
     18PREINSTALL_FILES = $(PROJECT_INCLUDE) \
     19    $(include_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     20
     21$(PROJECT_INCLUDE):
     22        @$(mkinstalldirs) $@
     23$(PROJECT_INCLUDE)/motorola:
     24        @$(mkinstalldirs) $@
     25$(PROJECT_INCLUDE)/rtems:
     26        @$(mkinstalldirs) $@
     27$(PROJECT_INCLUDE)/sys:
     28        @$(mkinstalldirs) $@
     29$(PROJECT_INCLUDE)/zilog:
     30        @$(mkinstalldirs) $@
     31
     32$(PROJECT_INCLUDE)/%.h: include/%.h
     33        $(INSTALL_DATA) $< $@
     34
     35## motorola
     36
     37include_motoroladir = $(includedir)/motorola
     38
     39include_motorola_HEADERS = include/motorola/mc68230.h include/motorola/mc68681.h
     40
     41PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \
     42    $(include_motorola_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     43
     44## rtems
     45include_rtemsdir = $(includedir)/rtems
     46
     47include_rtems_HEADERS = \
     48    include/rtems/assoc.h include/rtems/error.h include/rtems/libcsupport.h \
     49    include/rtems/libio.h include/rtems/libio_.h \
     50    include/rtems/termiostypes.h
     51
     52PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
     53    $(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     54
     55## sys
     56
     57include_sysdir = $(includedir)/sys
     58
     59if !HAS_NETWORKING
     60NETWORKING_H_FILES = include/sys/ioctl.h
     61endif
     62
     63if NEWLIB
     64NEWLIB_H_FILES = include/sys/termios.h include/sys/cdefs.h include/sys/utsname.h
     65endif
     66
     67include_sys_HEADERS = \
     68include/sys/ioccom.h \
     69include/sys/ttycom.h \
     70include/sys/utime.h \
     71$(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
     72
     73PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
     74    $(include_sys_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     75
     76## zilog
     77
     78include_zilogdir = $(includedir)/zilog
     79
     80include_zilog_HEADERS = include/zilog/z8036.h include/zilog/z8530.h \
     81    include/zilog/z8536.h
     82
     83PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \
     84    $(include_zilog_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     85
     86##  General stuff
     87all-local: $(PREINSTALL_FILES)
    888
    989include $(top_srcdir)/../../../automake/subdirs.am
  • c/src/lib/configure.ac

    rdc7fb59b rdeb66d1  
    3636# Explicitly list all Makefiles here
    3737AC_CONFIG_FILES([Makefile
    38 include/Makefile
    3938libc/Makefile])
    4039AC_OUTPUT
  • c/src/lib/libc/Makefile.am

    rdc7fb59b rdeb66d1  
    33##
    44
     5include $(top_srcdir)/../../../automake/multilib.am
     6include $(top_srcdir)/../../../automake/compile.am
     7include $(top_srcdir)/../../../automake/lib.am
    58
    69LIBNAME = libcsupport
     
    3740
    3841LIBC_GLUE_C_FILES = __getpid.c __gettod.c __times.c truncate.c access.c \
    39     stat.c lstat.c pathconf.c newlibc.c no_posix.c no_libc.c
     42    stat.c lstat.c pathconf.c newlibc.c no_posix.c no_libc.c utsname.c
    4043
    4144UNIX_LIBC_C_FILES = unixlibc.c hosterr.c
     
    5760endif
    5861C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
    59 
    60 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    61 include $(top_srcdir)/../../../automake/compile.am
    62 include $(top_srcdir)/../../../automake/lib.am
    6362
    6463TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
  • cpukit/libcsupport/Makefile.am

    rdc7fb59b rdeb66d1  
    55ACLOCAL_AMFLAGS = -I ../../../aclocal
    66
    7 SUBDIRS = include libc
     7include $(top_srcdir)/../../../automake/multilib.am
     8
     9SUBDIRS = . libc
     10
     11include_HEADERS = include/chain.h include/console.h include/clockdrv.h \
     12    include/iosupp.h include/ringbuf.h include/rtc.h \
     13    include/spurious.h include/timerdrv.h include/vmeintr.h
     14
     15LIBC_HFILES = include/stdint.h include/inttypes.h
     16include_HEADERS += $(LIBC_HFILES)
     17
     18PREINSTALL_FILES = $(PROJECT_INCLUDE) \
     19    $(include_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     20
     21$(PROJECT_INCLUDE):
     22        @$(mkinstalldirs) $@
     23$(PROJECT_INCLUDE)/motorola:
     24        @$(mkinstalldirs) $@
     25$(PROJECT_INCLUDE)/rtems:
     26        @$(mkinstalldirs) $@
     27$(PROJECT_INCLUDE)/sys:
     28        @$(mkinstalldirs) $@
     29$(PROJECT_INCLUDE)/zilog:
     30        @$(mkinstalldirs) $@
     31
     32$(PROJECT_INCLUDE)/%.h: include/%.h
     33        $(INSTALL_DATA) $< $@
     34
     35## motorola
     36
     37include_motoroladir = $(includedir)/motorola
     38
     39include_motorola_HEADERS = include/motorola/mc68230.h include/motorola/mc68681.h
     40
     41PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \
     42    $(include_motorola_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     43
     44## rtems
     45include_rtemsdir = $(includedir)/rtems
     46
     47include_rtems_HEADERS = \
     48    include/rtems/assoc.h include/rtems/error.h include/rtems/libcsupport.h \
     49    include/rtems/libio.h include/rtems/libio_.h \
     50    include/rtems/termiostypes.h
     51
     52PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
     53    $(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     54
     55## sys
     56
     57include_sysdir = $(includedir)/sys
     58
     59if !HAS_NETWORKING
     60NETWORKING_H_FILES = include/sys/ioctl.h
     61endif
     62
     63if NEWLIB
     64NEWLIB_H_FILES = include/sys/termios.h include/sys/cdefs.h include/sys/utsname.h
     65endif
     66
     67include_sys_HEADERS = \
     68include/sys/ioccom.h \
     69include/sys/ttycom.h \
     70include/sys/utime.h \
     71$(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
     72
     73PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
     74    $(include_sys_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     75
     76## zilog
     77
     78include_zilogdir = $(includedir)/zilog
     79
     80include_zilog_HEADERS = include/zilog/z8036.h include/zilog/z8530.h \
     81    include/zilog/z8536.h
     82
     83PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \
     84    $(include_zilog_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
     85
     86##  General stuff
     87all-local: $(PREINSTALL_FILES)
    888
    989include $(top_srcdir)/../../../automake/subdirs.am
  • cpukit/libcsupport/configure.ac

    rdc7fb59b rdeb66d1  
    3636# Explicitly list all Makefiles here
    3737AC_CONFIG_FILES([Makefile
    38 include/Makefile
    3938libc/Makefile])
    4039AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.