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

2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* configure.ac: Remove (Merged-in into ../configure.ac)
	* Makefile.am:
	Reflect having merged configure.ac into ../configure.ac.
	* src/config.h: New.
This commit is contained in:
Ralf Corsepius
2003-07-08 13:46:51 +00:00
parent c1a72962ab
commit 13482e5dcf
8 changed files with 48 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cpukit/itron/ChangeLog
View File

@@ -1,3 +1,10 @@
2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove (Merged-in into ../configure.ac)
* Makefile.am:
Reflect having merged configure.ac into ../configure.ac.
* src/config.h: New.
2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove AC_CONFIG_AUX_DIR.

26
cpukit/itron/Makefile.am
View File

@@ -2,11 +2,11 @@
## $Id$
##
ACLOCAL_AMFLAGS = -I ../aclocal
include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
include $(top_srcdir)/../automake/multilib.am
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/lib.am
EXTRA_DIST =
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
@@ -20,8 +20,12 @@ $(PROJECT_INCLUDE)/%.h: include/%.h
$(PROJECT_INCLUDE)/%.inl: $(INLINEdir)/%.inl
$(INSTALL_DATA) $< $@
if HAS_ITRON
## include
noinst_HEADERS =
noinst_HEADERS += src/config.h
include_HEADERS = include/itron.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)
@@ -39,7 +43,7 @@ include_itronsys_HEADERS = include/itronsys/eventflags.h include/itronsys/fmempo
PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys \
$(include_itronsys_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
EXTRA_DIST = include/itronsys/README
EXTRA_DIST += include/itronsys/README
## rtems/itron
include_rtems_itrondir = $(includedir)/rtems/itron
@@ -63,7 +67,7 @@ inline_H_FILES = inline/rtems/itron/eventflags.inl \
inline/rtems/itron/msgbuffer.inl inline/rtems/itron/network.inl inline/rtems/itron/port.inl \
inline/rtems/itron/semaphore.inl inline/rtems/itron/sysmgmt.inl inline/rtems/itron/task.inl \
inline/rtems/itron/time.inl inline/rtems/itron/vmempool.inl
noinst_HEADERS = $(inline_H_FILES)
noinst_HEADERS += $(inline_H_FILES)
if INLINE
PREINSTALL_FILES += $(inline_H_FILES:inline/%=$(PROJECT_INCLUDE)/%)
@@ -127,10 +131,13 @@ C_FILES = $(TASK_C_FILES) $(TASKSYNC_C_FILES) $(SEMAPHORE_C_FILES) \
$(TIME_C_FILES)
OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT))
AM_CPPFLAGS += -Isrc -D__RTEMS_INSIDE__
AM_CPPFLAGS += -I$(srcdir)/src -D__RTEMS_INSIDE__
all-local: $(PREINSTALL_FILES) ${ARCH} ${LIB}
$(LIB): ${OBJS}
$(make-library)
endif
${ARCH}/%.$(OBJEXT): src/%.c
${COMPILE} -o $@ -c $<
@@ -140,7 +147,4 @@ UNUSED_C_FILES = src/cre_mbx.c src/del_mbx.c src/mboxtranslatereturncode.c src/n
EXTRA_DIST += $(C_FILES) $(UNUSED_C_FILES) src/TODO
## General
all-local: $(PREINSTALL_FILES) ${ARCH} ${LIB}
include $(top_srcdir)/../automake/local.am
include $(top_srcdir)/automake/local.am

50
cpukit/itron/configure.ac
View File

@@ -1,50 +0,0 @@
## Process this file with autoconf to produce a configure script.
##
## $Id$
AC_PREREQ(2.57)
AC_INIT([rtems-cpukit-itron],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([include/itronsys])
RTEMS_TOP(../..)
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
AM_MAINTAINER_MODE
RTEMS_ENABLE_ITRON
RTEMS_ENABLE_INLINES
RTEMS_ENV_RTEMSCPU
RTEMS_CHECK_CPU
RTEMS_CANONICAL_HOST
RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS
AC_PROG_RANLIB
RTEMS_CHECK_ITRON_API
# If RTEMS macros are enabled, then use them. Otherwise, use inlines.
if test "$RTEMS_USE_MACROS" = "yes"; then
INLINEdir="macros"
else
INLINEdir="inline"
fi
AC_SUBST(INLINEdir)
AM_CONDITIONAL(INLINE,test "$INLINEdir" = "inline" )
AM_CONDITIONAL(MACROS,test "$INLINEdir" = "macros" )
## Needed when using automake for libs/rels
RTEMS_CHECK_NEWLIB
AM_CONFIG_HEADER([src/config.h])
##
## FIXME: We configure and build the macros subdirectory, too.
## Should probably use AM_CONDITIONALs to disable them in future
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

5
cpukit/itron/src/config.h Normal file
View File

@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>

7
cpukit/posix/ChangeLog
View File

@@ -1,3 +1,10 @@
2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove (Merged-in into ../configure.ac)
* Makefile.am:
Reflect having merged configure.ac into ../configure.ac.
* src/config.h: New.
2003-02-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: AM_INIT_AUTOMAKE([1.7.2]).

16
cpukit/posix/Makefile.am
View File

@@ -2,11 +2,9 @@
## $Id$
##
ACLOCAL_AMFLAGS = -I ../aclocal
include $(top_srcdir)/../automake/multilib.am
include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/lib.am
include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
EXTRA_DIST =
@@ -20,12 +18,15 @@ $(PROJECT_INCLUDE)/%.h: include/%.h
$(PROJECT_INCLUDE)/%.inl: $(INLINEdir)/%.inl
$(INSTALL_DATA) $< $@
if HAS_POSIX
PREINSTALL_FILES = $(PROJECT_INCLUDE)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix
# include
noinst_HEADERS = include/devctl.h include/intr.h
noinst_HEADERS += src/config.h
include_HEADERS = include/sched.h include/aio.h include/mqueue.h include/semaphore.h
@@ -170,12 +171,13 @@ OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT))
# Add local stuff here using +=
#
AM_CPPFLAGS += -Isrc -D__RTEMS_INSIDE__
AM_CPPFLAGS += -I$(srcdir)/src -D__RTEMS_INSIDE__
all-local: ${ARCH} $(PREINSTALL_FILES) $(LIB)
$(LIB): ${OBJS}
$(make-library)
endif
${ARCH}/%.$(OBJEXT): src/%.c
${COMPILE} -o $@ -c $<
@@ -191,4 +193,4 @@ not:
EXTRA_DIST += $(C_FILES) $(UNUSED_C_FILES)
include $(top_srcdir)/../automake/local.am
include $(top_srcdir)/automake/local.am

54
cpukit/posix/configure.ac
View File

@@ -1,54 +0,0 @@
## Process this file with autoconf to produce a configure script.
##
## $Id$
AC_PREREQ(2.57)
AC_INIT([rtems-cpukit-posix],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([src/pthread.c])
RTEMS_TOP(../..)
AC_CONFIG_AUX_DIR(../..)
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2])
AM_MAINTAINER_MODE
RTEMS_ENABLE_POSIX
RTEMS_ENABLE_INLINES
RTEMS_ENV_RTEMSCPU
RTEMS_CHECK_CPU
RTEMS_CANONICAL_HOST
RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS
AC_PROG_RANLIB
RTEMS_CHECK_MULTIPROCESSING
RTEMS_CHECK_POSIX_API
# If RTEMS macros are enabled, then use them. Otherwise, use inlines.
if test "$RTEMS_USE_MACROS" = "yes"; then
INLINEdir="macros"
else
INLINEdir="inline"
fi
AC_SUBST(INLINEdir)
AM_CONDITIONAL(INLINE,test "$INLINEdir" = "inline" )
AM_CONDITIONAL(MACROS,test "$INLINEdir" = "macros" )
AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes" )
## Needed when using automake for libs/rels
RTEMS_CHECK_NEWLIB
## Refuse to build if bsp does not support libposix
if test "$HAS_POSIX_API" != "yes"; then
AC_MSG_ERROR([libposix is not supported by this configuration])
fi
AM_CONFIG_HEADER([src/config.h])
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

5
cpukit/posix/src/config.h Normal file
View File

@@ -0,0 +1,5 @@
/* HACK:
* Pull-in RTEMS global config-header cpuopts.h as local config.h
*/
#include <rtems/score/cpuopts.h>