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

2001-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* configure.ac: Use AS_IF instead of if/then/else.
	Add AC_DEFINE_UNQUOTED(RTEMS_UNIX) for RTEMS_CPU==unix.
	Add AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB) for RTEMS_CPU==unix.
	Add include/Makefile to CONFIG_FILES.
	Add AC_ENABLE_MULITLIB.
	Remove wrapup/rtems, wrapup/itron, wrapup/posix.
	Remove */optman/Makefile from CONFIG_FILES.
	* Makefile.am: Add include to SUBDIRS.
	* rtems/Makefile.am: Remove optman from SUBDIRS.
	* sapi/Makefile.am: Remove optman from SUBDIRS.
	* include/Makefile.am: New file.
	* include/rtems/bspIo.h: Relocated from lib/include.
	* include/rtems/libio_.h: Relocated from lib/include.
This commit is contained in:
Joel Sherrill
2002-01-04 17:57:28 +00:00
parent 46ea78a08c
commit 8217c40656
24 changed files with 148 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
c/src/exec/ChangeLog
View File

@@ -1,3 +1,19 @@
2001-12-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Use AS_IF instead of if/then/else.
Add AC_DEFINE_UNQUOTED(RTEMS_UNIX) for RTEMS_CPU==unix.
Add AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB) for RTEMS_CPU==unix.
Add include/Makefile to CONFIG_FILES.
Add AC_ENABLE_MULITLIB.
Remove wrapup/rtems, wrapup/itron, wrapup/posix.
Remove */optman/Makefile from CONFIG_FILES.
* Makefile.am: Add include to SUBDIRS.
* rtems/Makefile.am: Remove optman from SUBDIRS.
* sapi/Makefile.am: Remove optman from SUBDIRS.
* include/Makefile.am: New file.
* include/rtems/bspIo.h: Relocated from lib/include.
* include/rtems/libio_.h: Relocated from lib/include.
2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/posix/Makefile.am: Add multilib support.

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

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

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

@@ -39,26 +39,25 @@ RTEMS_CHECK_POSIX_API(RTEMS_BSP)
RTEMS_CHECK_ITRON_API(RTEMS_BSP)
# If RTEMS macros are enabled, then use them. Otherwise, use inlines.
if test "$RTEMS_USE_MACROS" = "yes"; then
INLINEdir="macros"
else
INLINEdir="inline"
fi
AM_CONDITIONAL(INLINE,test "$INLINEdir" = "inline" )
AM_CONDITIONAL(MACROS,test "$INLINEdir" = "macros" )
AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes" )
AS_IF([test "$RTEMS_USE_MACROS" = "yes"],
[INLINEdir="macros"],
[INLINEdir="inline"])
AM_CONDITIONAL(INLINE,test x"$INLINEdir" = x"inline" )
AM_CONDITIONAL(MACROS,test x"$INLINEdir" = x"macros" )
AM_CONDITIONAL(HAS_MP,test x"$HAS_MP" = x"yes" )
AC_SUBST(RTEMS_VERSION)
AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes")
AM_CONDITIONAL(HAS_ITRON,test "$HAS_ITRON_API" = "yes")
AM_CONDITIONAL(HAS_POSIX,test x"$HAS_POSIX_API" = x"yes")
AM_CONDITIONAL(HAS_ITRON,test x"$HAS_ITRON_API" = x"yes")
if test "$HAS_POSIX_API" = "yes"; then
AC_CONFIG_SUBDIRS(posix)
fi
if test "$HAS_ITRON_API" = "yes"; then
AC_CONFIG_SUBDIRS(itron)
fi
AS_IF([test x"$HAS_POSIX_API" = x"yes"],
[AC_CONFIG_SUBDIRS([posix])]
)
AS_IF([test x"$HAS_ITRON_API" = x"yes"],
[AC_CONFIG_SUBDIRS(itron)]
)
RTEMS_CPU_SUBDIRS([score/cpu])
RTEMS_DEFINE_POSIX_API
@@ -66,18 +65,27 @@ RTEMS_DEFINE_ITRON_API
RTEMS_DEFINE_MULTIPROCESSING
# HACK: We should use a feature-based configuration.
if test x"${RTEMS_CPU}" = x"unix"; then
AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
fi
AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
AC_DEFINE_UNQUOTED(RTEMS_UNIX,1,[to indicate RTEMS unix])
# HACK: silently accept --enable-unixlib
test "${enable_unixlib}+set" != set || enable_unixlib="yes"
])
AS_IF([test x"${enable_unixlib}" = x"yes"],
[AC_DEFINE_UNQUOTED(RTEMS_UNIXLIB,[1],
[to indicate RTEMS using RTEMS's unixlib])]
)
AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h)
AC_ENABLE_MULTILIB([Makefile],[..])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
include/Makefile
rtems/Makefile
rtems/src/Makefile
rtems/include/Makefile
rtems/optman/Makefile
rtems/inline/Makefile
rtems/macros/Makefile
sapi/Makefile
@@ -86,7 +94,6 @@ sapi/include/Makefile
sapi/include/rtems/sptables.h
sapi/inline/Makefile
sapi/macros/Makefile
sapi/optman/Makefile
score/Makefile
score/cpu/Makefile
score/include/Makefile
@@ -94,8 +101,5 @@ score/inline/Makefile
score/macros/Makefile
score/src/Makefile
wrapup/Makefile
wrapup/rtems/Makefile
wrapup/itron/Makefile
wrapup/posix/Makefile
])
AC_OUTPUT

27
c/src/exec/include/Makefile.am Normal file
View File

@@ -0,0 +1,27 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.5
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE):
@$(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) $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am

3
c/src/exec/include/rtems/libio_.h
View File

@@ -308,6 +308,3 @@ int init_fs_mount_table();
#endif
/* end of include file */

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

@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = include inline macros optman src
SUBDIRS = include inline macros src
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

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

@@ -4,7 +4,7 @@
AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = include inline macros optman src
SUBDIRS = include inline macros src
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

2
c/src/exec/wrapup/.cvsignore
View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

18
c/src/exec/wrapup/Makefile.am
View File

@@ -1,18 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
if HAS_POSIX
POSIX_DIRS = posix
endif
if HAS_ITRON
ITRON_DIRS = itron
endif
SUBDIRS = rtems $(POSIX_DIRS) $(ITRON_DIRS)
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

2
c/src/exec/wrapup/itron/.cvsignore
View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

36
c/src/exec/wrapup/itron/Makefile.am
View File

@@ -1,36 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
if HAS_ITRON
LIBNAME = libitron
LIB = $(ARCH)/$(LIBNAME).a
endif
include $(top_srcdir)/../../../automake/multilib.am
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
if HAS_ITRON
ITRON_OBJS = $(wildcard ../../itron/src/$(ARCH)/*.o)
OBJS = $(ITRON_OBJS)
$(LIB): ${OBJS}
$(make-library)
ITRON_LIB = $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
$(INSTALL_DATA) $< $@
all-local: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
endif
TMPINSTALL_FILES += $(ITRON_LIB)
include $(top_srcdir)/../../../automake/local.am

2
c/src/exec/wrapup/posix/.cvsignore
View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

36
c/src/exec/wrapup/posix/Makefile.am
View File

@@ -1,36 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
if HAS_POSIX
LIBNAME = libposix
LIB = $(ARCH)/$(LIBNAME).a
endif
include $(top_srcdir)/../../../automake/multilib.am
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
if HAS_POSIX
POSIX_OBJS = $(wildcard ../../posix/src/$(ARCH)/*.o)
OBJS = $(POSIX_OBJS)
$(LIB): ${OBJS}
$(make-library)
POSIX_LIB = $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
$(INSTALL_DATA) $< $@
all-local: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
endif
TMPINSTALL_FILES += $(POSIX_LIB)
include $(top_srcdir)/../../../automake/local.am

2
c/src/exec/wrapup/rtems/.cvsignore
View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

33
c/src/exec/wrapup/rtems/Makefile.am
View File

@@ -1,33 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
LIBNAME = librtems
LIB = $(ARCH)/$(LIBNAME).a
include $(top_srcdir)/../../../automake/multilib.am
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
CPU_OBJS = $(wildcard ../../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel)
CORE_OBJS = $(wildcard ../../score/src/$(ARCH)/*.o)
SAPI_OBJS = $(wildcard ../../sapi/src/$(ARCH)/*.o)
RTEMS_OBJS = $(wildcard ../../rtems/src/$(ARCH)/*.o)
OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS)
SIZE_RTEMS = $(SHELL) $(PROJECT_TOPdir)/tools/cpu/generic/size_rtems
$(LIB): ${OBJS}
$(make-library)
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
$(INSTALL_DATA) $< $@
all-local: ${ARCH} $(TMPINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am