summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-05-14 18:46:05 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-05-14 18:46:05 +0000
commitdeb66d121b3f4d5b54f5cf7867dc33283e10b536 (patch)
treeba578dd7ad88dbaeb86b5fcccb98b2807b7a6ef2
parent2002-05-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-deb66d121b3f4d5b54f5cf7867dc33283e10b536.tar.bz2
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
-rw-r--r--c/src/exec/libcsupport/Makefile.am82
-rw-r--r--c/src/exec/libcsupport/configure.ac1
-rw-r--r--c/src/exec/libcsupport/src/Makefile.am9
-rw-r--r--c/src/lib/ChangeLog11
-rw-r--r--c/src/lib/Makefile.am82
-rw-r--r--c/src/lib/configure.ac1
-rw-r--r--c/src/lib/include/Makefile.am79
-rw-r--r--c/src/lib/libc/Makefile.am9
-rw-r--r--cpukit/libcsupport/Makefile.am82
-rw-r--r--cpukit/libcsupport/configure.ac1
10 files changed, 262 insertions, 95 deletions
diff --git a/c/src/exec/libcsupport/Makefile.am b/c/src/exec/libcsupport/Makefile.am
index 35f812633f..93e28ebdee 100644
--- a/c/src/exec/libcsupport/Makefile.am
+++ b/c/src/exec/libcsupport/Makefile.am
@@ -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
diff --git a/c/src/exec/libcsupport/configure.ac b/c/src/exec/libcsupport/configure.ac
index db7ef7ae23..6b7379f1fc 100644
--- a/c/src/exec/libcsupport/configure.ac
+++ b/c/src/exec/libcsupport/configure.ac
@@ -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
diff --git a/c/src/exec/libcsupport/src/Makefile.am b/c/src/exec/libcsupport/src/Makefile.am
index ab08e9f43c..630522af4c 100644
--- a/c/src/exec/libcsupport/src/Makefile.am
+++ b/c/src/exec/libcsupport/src/Makefile.am
@@ -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)
diff --git a/c/src/lib/ChangeLog b/c/src/lib/ChangeLog
index e86367bc35..320ee15b04 100644
--- a/c/src/lib/ChangeLog
+++ b/c/src/lib/ChangeLog
@@ -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.
diff --git a/c/src/lib/Makefile.am b/c/src/lib/Makefile.am
index 35f812633f..93e28ebdee 100644
--- a/c/src/lib/Makefile.am
+++ b/c/src/lib/Makefile.am
@@ -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
diff --git a/c/src/lib/configure.ac b/c/src/lib/configure.ac
index db7ef7ae23..6b7379f1fc 100644
--- a/c/src/lib/configure.ac
+++ b/c/src/lib/configure.ac
@@ -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
diff --git a/c/src/lib/include/Makefile.am b/c/src/lib/include/Makefile.am
deleted file mode 100644
index d334846f7e..0000000000
--- a/c/src/lib/include/Makefile.am
+++ /dev/null
@@ -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
diff --git a/c/src/lib/libc/Makefile.am b/c/src/lib/libc/Makefile.am
index ab08e9f43c..630522af4c 100644
--- a/c/src/lib/libc/Makefile.am
+++ b/c/src/lib/libc/Makefile.am
@@ -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)
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index 35f812633f..93e28ebdee 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -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
diff --git a/cpukit/libcsupport/configure.ac b/cpukit/libcsupport/configure.ac
index db7ef7ae23..6b7379f1fc 100644
--- a/cpukit/libcsupport/configure.ac
+++ b/cpukit/libcsupport/configure.ac
@@ -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