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

2002-01-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* Makefile.am: Apply @subdirs. Remove POSIX_SUBDIRS. Remove
	ITRON_SUBDIRS.
	* configure.ac: Rework enable_unixlib handling.
	Add RTEMS_MULTILIBS to cpuopts.h.
	* include/Makefile.am: Add rtems/fs.h, rtems/userenv.h.
	Add $(PROJECT_INCLUDE)/rtems. Remove libio_.h.
This commit is contained in:
Joel Sherrill
2002-01-16 22:53:30 +00:00
parent 38fcef5cf4
commit 64b1f81052
8 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/exec/ChangeLog
View File

@@ -1,3 +1,13 @@
2002-01-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Apply @subdirs. Remove POSIX_SUBDIRS. Remove
ITRON_SUBDIRS.
* configure.ac: Rework enable_unixlib handling.
Add RTEMS_MULTILIBS to cpuopts.h.
* include/Makefile.am: Add rtems/fs.h, rtems/userenv.h.
Add $(PROJECT_INCLUDE)/rtems. Remove libio_.h.
2002-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Add install-hook.

10
c/src/exec/Makefile.am
View File

@@ -7,15 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
include $(top_srcdir)/../../../automake/multilib.am
if HAS_POSIX
POSIX_SUBDIRS = posix
endif
if HAS_ITRON
ITRON_SUBDIRS = itron
endif
SUBDIRS = include score rtems $(POSIX_SUBDIRS) $(ITRON_SUBDIRS) sapi wrapup
SUBDIRS = include score rtems sapi @subdirs@ wrapup
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

13
c/src/exec/configure.ac
View File

@@ -66,13 +66,13 @@ RTEMS_DEFINE_MULTIPROCESSING
# HACK: We should use a feature-based configuration.
AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
AC_DEFINE_UNQUOTED([RTEMS_UNIX],[1],[to indicate RTEMS unix])
# HACK: silently accept --enable-unixlib
test "${enable_unixlib}+set" != set || enable_unixlib="yes"
test -n "${enable_unixlib}" || enable_unixlib="yes"
])
AS_IF([test x"${enable_unixlib}" = x"yes"],
[AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB,[1],
[AC_DEFINE_UNQUOTED([RTEMS_UNIXLIB],[1],
[to indicate RTEMS using RTEMS's unixlib])]
)
@@ -80,6 +80,13 @@ AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h)
AC_ENABLE_MULTILIB([Makefile],[..])
## HACK: Add a define to cpuopts.h to indicate using multilibs
## Can be applied to produce compiler errors if using
## multilib-incompatible settings somewhere else (eg. bspopts.h).
AS_IF([test x"${enable_multilib}" = x"yes"],[
AC_DEFINE_UNQUOTED([RTEMS_MULTILIBS],[1],[using multilib'ed RTEMS])
])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
include/Makefile

8
c/src/exec/include/Makefile.am
View File

@@ -10,14 +10,14 @@ $(PROJECT_INCLUDE)/%.h: %.h
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = rtems/bspIo.h rtems/libio_.h
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
include_rtems_HEADERS = rtems/bspIo.h rtems/userenv.h rtems/fs.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)

10
cpukit/ChangeLog
View File

@@ -1,3 +1,13 @@
2002-01-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Apply @subdirs. Remove POSIX_SUBDIRS. Remove
ITRON_SUBDIRS.
* configure.ac: Rework enable_unixlib handling.
Add RTEMS_MULTILIBS to cpuopts.h.
* include/Makefile.am: Add rtems/fs.h, rtems/userenv.h.
Add $(PROJECT_INCLUDE)/rtems. Remove libio_.h.
2002-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Add install-hook.

10
cpukit/Makefile.am
View File

@@ -7,15 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
include $(top_srcdir)/../../../automake/multilib.am
if HAS_POSIX
POSIX_SUBDIRS = posix
endif
if HAS_ITRON
ITRON_SUBDIRS = itron
endif
SUBDIRS = include score rtems $(POSIX_SUBDIRS) $(ITRON_SUBDIRS) sapi wrapup
SUBDIRS = include score rtems sapi @subdirs@ wrapup
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

13
cpukit/configure.ac
View File

@@ -66,13 +66,13 @@ RTEMS_DEFINE_MULTIPROCESSING
# HACK: We should use a feature-based configuration.
AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
AC_DEFINE_UNQUOTED([RTEMS_UNIX],[1],[to indicate RTEMS unix])
# HACK: silently accept --enable-unixlib
test "${enable_unixlib}+set" != set || enable_unixlib="yes"
test -n "${enable_unixlib}" || enable_unixlib="yes"
])
AS_IF([test x"${enable_unixlib}" = x"yes"],
[AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB,[1],
[AC_DEFINE_UNQUOTED([RTEMS_UNIXLIB],[1],
[to indicate RTEMS using RTEMS's unixlib])]
)
@@ -80,6 +80,13 @@ AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h)
AC_ENABLE_MULTILIB([Makefile],[..])
## HACK: Add a define to cpuopts.h to indicate using multilibs
## Can be applied to produce compiler errors if using
## multilib-incompatible settings somewhere else (eg. bspopts.h).
AS_IF([test x"${enable_multilib}" = x"yes"],[
AC_DEFINE_UNQUOTED([RTEMS_MULTILIBS],[1],[using multilib'ed RTEMS])
])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
include/Makefile

8
cpukit/include/Makefile.am
View File

@@ -10,14 +10,14 @@ $(PROJECT_INCLUDE)/%.h: %.h
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = rtems/bspIo.h rtems/libio_.h
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
include_rtems_HEADERS = rtems/bspIo.h rtems/userenv.h rtems/fs.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)