RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-05-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* 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
This commit is contained in:
Joel Sherrill
2002-05-14 18:46:05 +00:00
parent dc7fb59bb7
commit deb66d121b
10 changed files with 262 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
c/src/exec/libcsupport/Makefile.am
View File

@@ -4,7 +4,87 @@
ACLOCAL_AMFLAGS = -I ../../../aclocal
SUBDIRS = include libc
include $(top_srcdir)/../../../automake/multilib.am
SUBDIRS = . libc
include_HEADERS = include/chain.h include/console.h include/clockdrv.h \
include/iosupp.h include/ringbuf.h include/rtc.h \
include/spurious.h include/timerdrv.h include/vmeintr.h
LIBC_HFILES = include/stdint.h include/inttypes.h
include_HEADERS += $(LIBC_HFILES)
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/motorola:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/zilog:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: include/%.h
$(INSTALL_DATA) $< $@
## motorola
include_motoroladir = $(includedir)/motorola
include_motorola_HEADERS = include/motorola/mc68230.h include/motorola/mc68681.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \
$(include_motorola_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
## rtems
include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = \
include/rtems/assoc.h include/rtems/error.h include/rtems/libcsupport.h \
include/rtems/libio.h include/rtems/libio_.h \
include/rtems/termiostypes.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
## sys
include_sysdir = $(includedir)/sys
if !HAS_NETWORKING
NETWORKING_H_FILES = include/sys/ioctl.h
endif
if NEWLIB
NEWLIB_H_FILES = include/sys/termios.h include/sys/cdefs.h include/sys/utsname.h
endif
include_sys_HEADERS = \
include/sys/ioccom.h \
include/sys/ttycom.h \
include/sys/utime.h \
$(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
$(include_sys_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
## zilog
include_zilogdir = $(includedir)/zilog
include_zilog_HEADERS = include/zilog/z8036.h include/zilog/z8530.h \
include/zilog/z8536.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \
$(include_zilog_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
## General stuff
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

1
c/src/exec/libcsupport/configure.ac
View File

@@ -35,6 +35,5 @@ AM_CONFIG_HEADER(libc/config.h)
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
include/Makefile
libc/Makefile])
AC_OUTPUT

9
c/src/exec/libcsupport/src/Makefile.am
View File

@@ -2,6 +2,9 @@
## $Id$
##
include $(top_srcdir)/../../../automake/multilib.am
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
LIBNAME = libcsupport
LIB = ${ARCH}/${LIBNAME}.a
@@ -36,7 +39,7 @@ PASSWORD_GROUP_C_FILES = getpwent.c getgrent.c
TERMINAL_IDENTIFICATION_C_FILES = ctermid.c isatty.c ttyname.c ttyname_r.c
LIBC_GLUE_C_FILES = __getpid.c __gettod.c __times.c truncate.c access.c \
stat.c lstat.c pathconf.c newlibc.c no_posix.c no_libc.c
stat.c lstat.c pathconf.c newlibc.c no_posix.c no_libc.c utsname.c
UNIX_LIBC_C_FILES = unixlibc.c hosterr.c
@@ -57,10 +60,6 @@ C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES)
endif
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
OBJS = $(C_O_FILES)

11
c/src/lib/ChangeLog
View File

@@ -1,3 +1,14 @@
2002-05-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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
2002-05-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/sys/ioctl.h: Relocated from libnetworking/sys.

82
c/src/lib/Makefile.am
View File

@@ -4,7 +4,87 @@
ACLOCAL_AMFLAGS = -I ../../../aclocal
SUBDIRS = include libc
include $(top_srcdir)/../../../automake/multilib.am
SUBDIRS = . libc
include_HEADERS = include/chain.h include/console.h include/clockdrv.h \
include/iosupp.h include/ringbuf.h include/rtc.h \
include/spurious.h include/timerdrv.h include/vmeintr.h
LIBC_HFILES = include/stdint.h include/inttypes.h
include_HEADERS += $(LIBC_HFILES)
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/motorola:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/zilog:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: include/%.h
$(INSTALL_DATA) $< $@
## motorola
include_motoroladir = $(includedir)/motorola
include_motorola_HEADERS = include/motorola/mc68230.h include/motorola/mc68681.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \
$(include_motorola_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
## rtems
include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = \
include/rtems/assoc.h include/rtems/error.h include/rtems/libcsupport.h \
include/rtems/libio.h include/rtems/libio_.h \
include/rtems/termiostypes.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
## sys
include_sysdir = $(includedir)/sys
if !HAS_NETWORKING
NETWORKING_H_FILES = include/sys/ioctl.h
endif
if NEWLIB
NEWLIB_H_FILES = include/sys/termios.h include/sys/cdefs.h include/sys/utsname.h
endif
include_sys_HEADERS = \
include/sys/ioccom.h \
include/sys/ttycom.h \
include/sys/utime.h \
$(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
$(include_sys_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
## zilog
include_zilogdir = $(includedir)/zilog
include_zilog_HEADERS = include/zilog/z8036.h include/zilog/z8530.h \
include/zilog/z8536.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \
$(include_zilog_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
## General stuff
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

1
c/src/lib/configure.ac
View File

@@ -35,6 +35,5 @@ AM_CONFIG_HEADER(libc/config.h)
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
include/Makefile
libc/Makefile])
AC_OUTPUT

79
c/src/lib/include/Makefile.am
View File

@@ -1,79 +0,0 @@
##
## $Id$
##
include_HEADERS = chain.h console.h clockdrv.h iosupp.h ringbuf.h rtc.h \
spurious.h timerdrv.h vmeintr.h
LIBC_HFILES = stdint.h inttypes.h
include_HEADERS += $(LIBC_HFILES)
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/motorola:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/zilog:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
## motorola
include_motoroladir = $(includedir)/motorola
include_motorola_HEADERS = motorola/mc68230.h motorola/mc68681.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/motorola \
$(include_motorola_HEADERS:%=$(PROJECT_INCLUDE)/%)
## rtems
include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = \
rtems/assoc.h rtems/error.h rtems/libcsupport.h rtems/libio.h rtems/libio_.h \
rtems/termiostypes.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
## sys
include_sysdir = $(includedir)/sys
NETWORKING_H_FILES = sys/ioctl.h sys/sockio.h sys/filio.h
if NEWLIB
NEWLIB_H_FILES = sys/termios.h sys/cdefs.h
endif
include_sys_HEADERS = \
sys/ioccom.h \
sys/ttycom.h \
sys/utime.h \
$(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys \
$(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/%)
## zilog
include_zilogdir = $(includedir)/zilog
include_zilog_HEADERS = zilog/z8036.h zilog/z8530.h zilog/z8536.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \
$(include_zilog_HEADERS:%=$(PROJECT_INCLUDE)/%)
## General stuff
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am

9
c/src/lib/libc/Makefile.am
View File

@@ -2,6 +2,9 @@
## $Id$
##
include $(top_srcdir)/../../../automake/multilib.am
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
LIBNAME = libcsupport
LIB = ${ARCH}/${LIBNAME}.a
@@ -36,7 +39,7 @@ PASSWORD_GROUP_C_FILES = getpwent.c getgrent.c
TERMINAL_IDENTIFICATION_C_FILES = ctermid.c isatty.c ttyname.c ttyname_r.c
LIBC_GLUE_C_FILES = __getpid.c __gettod.c __times.c truncate.c access.c \
stat.c lstat.c pathconf.c newlibc.c no_posix.c no_libc.c
stat.c lstat.c pathconf.c newlibc.c no_posix.c no_libc.c utsname.c
UNIX_LIBC_C_FILES = unixlibc.c hosterr.c
@@ -57,10 +60,6 @@ C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES)
endif
C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
OBJS = $(C_O_FILES)