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

2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* include/zilog/Makefile.am: Remove.
	* include/motorola/Makefile.am: Remove.
	* include/sys/Makefile.am: Remove.
	* include/rtems/Makefile.am: Remove.
	* include/Makefile.am: Handle subdirs, require automake-1.5
	* Makefile.am: Require automake-1.5.
This commit is contained in:
Joel Sherrill
2001-10-16 18:50:03 +00:00
parent 14a67aa9e4
commit 49ed8e7758
16 changed files with 77 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
ACLOCAL_AMFLAGS = -I ../../../aclocal ACLOCAL_AMFLAGS = -I ../../../aclocal
SUBDIRS = include libc SUBDIRS = include libc

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

@@ -39,9 +39,5 @@ AM_CONFIG_HEADER(libc/config.h)
# Explicitly list all Makefiles here # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
include/Makefile include/Makefile
include/rtems/Makefile
include/sys/Makefile
include/motorola/Makefile
include/zilog/Makefile
libc/Makefile]) libc/Makefile])
AC_OUTPUT AC_OUTPUT

9
c/src/lib/ChangeLog
View File

@@ -1,3 +1,12 @@
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/zilog/Makefile.am: Remove.
* include/motorola/Makefile.am: Remove.
* include/sys/Makefile.am: Remove.
* include/rtems/Makefile.am: Remove.
* include/Makefile.am: Handle subdirs, require automake-1.5
* Makefile.am: Require automake-1.5.
2001-10-12 Joel Sherrill <joel@OARcorp.com> 2001-10-12 Joel Sherrill <joel@OARcorp.com>
* include/chain.h: Fixed typo. * include/chain.h: Fixed typo.

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

@@ -2,7 +2,7 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
ACLOCAL_AMFLAGS = -I ../../../aclocal ACLOCAL_AMFLAGS = -I ../../../aclocal
SUBDIRS = include libc SUBDIRS = include libc

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

@@ -39,9 +39,5 @@ AM_CONFIG_HEADER(libc/config.h)
# Explicitly list all Makefiles here # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
include/Makefile include/Makefile
include/rtems/Makefile
include/sys/Makefile
include/motorola/Makefile
include/zilog/Makefile
libc/Makefile]) libc/Makefile])
AC_OUTPUT AC_OUTPUT

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

@@ -2,7 +2,7 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
include_HEADERS = bspIo.h chain.h console.h clockdrv.h iosupp.h ringbuf.h rtc.h \ include_HEADERS = bspIo.h chain.h console.h clockdrv.h iosupp.h ringbuf.h rtc.h \
spurious.h timerdrv.h vmeintr.h spurious.h timerdrv.h vmeintr.h
@@ -12,12 +12,68 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(PROJECT_INCLUDE): $(PROJECT_INCLUDE):
@$(mkinstalldirs) $@ @$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/motorola:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/zilog:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h $(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@ $(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
if !HAS_NETWORKING
NETWORKING_H_FILES = sys/ioctl.h
endif
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) all-local: $(PREINSTALL_FILES)
SUBDIRS = sys rtems motorola zilog
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

21
c/src/lib/include/motorola/Makefile.am
View File

@@ -1,21 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_motoroladir = $(includedir)/motorola
include_motorola_HEADERS = mc68230.h mc68681.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/motorola \
$(include_motorola_HEADERS:%=$(PROJECT_INCLUDE)/motorola/%)
$(PROJECT_INCLUDE)/motorola:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/motorola/%.h: %.h
$(INSTALL_DATA) $< $@
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am

21
c/src/lib/include/rtems/Makefile.am
View File

@@ -1,21 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = assoc.h error.h libcsupport.h libio.h libio_.h termiostypes.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
$(INSTALL_DATA) $< $@
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am

33
c/src/lib/include/sys/Makefile.am
View File

@@ -1,33 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_sysdir = $(includedir)/sys
if HAS_NETWORKING
else
NETWORKING_H_FILES = ioctl.h
endif
if NEWLIB
NEWLIB_H_FILES = termios.h cdefs.h
endif
include_sys_HEADERS = ioccom.h ttycom.h utime.h \
$(NEWLIB_H_FILES) $(NETWORKING_H_FILES)
noinst_HEADERS = utime.h termios.h ioctl.h ioccom.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/sys \
$(include_sys_HEADERS:%=$(PROJECT_INCLUDE)/sys/%)
$(PROJECT_INCLUDE)/sys:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/sys/%.h: %.h
$(INSTALL_DATA) $< $@
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am

21
c/src/lib/include/zilog/Makefile.am
View File

@@ -1,21 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_zilogdir = ${includedir}/zilog
include_zilog_HEADERS = z8036.h z8530.h z8536.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/zilog \
$(include_zilog_HEADERS:%=$(PROJECT_INCLUDE)/zilog/%)
$(PROJECT_INCLUDE)/zilog:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/zilog/%.h: %.h
$(INSTALL_DATA) $< $@
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am

2
c/src/lib/libbsp/i960/cvme961/console/console.c
View File

@@ -11,8 +11,6 @@
* $Id$ * $Id$
*/ */
#define C961_INIT
#include <bsp.h> #include <bsp.h>
#include <rtems/libio.h> #include <rtems/libio.h>

2
c/src/lib/libbsp/i960/cvme961/startup/bspstart.c
View File

@@ -16,6 +16,8 @@
#include <string.h> #include <string.h>
#define C961_INIT
#include <bsp.h> #include <bsp.h>
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>

7
c/src/lib/libbsp/i960/rxgen960/include/bsp.h
View File

@@ -112,18 +112,13 @@ static inline i960_PRCB *get_prcb( void )
return ( _prcb ); return ( _prcb );
} }
/* #ifdef RXGEN960_INIT
#ifdef C961_INIT
#undef BSP_EXTERN #undef BSP_EXTERN
#define BSP_EXTERN #define BSP_EXTERN
#else #else
#undef BSP_EXTERN #undef BSP_EXTERN
#define BSP_EXTERN extern #define BSP_EXTERN extern
#endif #endif
*/
#undef BSP_EXTERN
#define BSP_EXTERN
/* miscellaneous stuff assumed to exist */ /* miscellaneous stuff assumed to exist */

2
c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c
View File

@@ -23,6 +23,8 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#define RXGEN960_INIT
#include <bsp.h> #include <bsp.h>
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>

2
cpukit/libcsupport/Makefile.am
View File

@@ -2,7 +2,7 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
ACLOCAL_AMFLAGS = -I ../../../aclocal ACLOCAL_AMFLAGS = -I ../../../aclocal
SUBDIRS = include libc SUBDIRS = include libc

4
cpukit/libcsupport/configure.ac
View File

@@ -39,9 +39,5 @@ AM_CONFIG_HEADER(libc/config.h)
# Explicitly list all Makefiles here # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
include/Makefile include/Makefile
include/rtems/Makefile
include/sys/Makefile
include/motorola/Makefile
include/zilog/Makefile
libc/Makefile]) libc/Makefile])
AC_OUTPUT AC_OUTPUT