summaryrefslogtreecommitdiffstats
path: root/cpukit/itron
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-07-08 13:46:51 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-07-08 13:46:51 +0000
commit13482e5dcfe9029a46825232b0a7d116af08ad1b (patch)
treec0b22e84943a4adb6212608010c283bbee7b01ce /cpukit/itron
parent2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-13482e5dcfe9029a46825232b0a7d116af08ad1b.tar.bz2
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.
Diffstat (limited to 'cpukit/itron')
-rw-r--r--cpukit/itron/ChangeLog7
-rw-r--r--cpukit/itron/Makefile.am26
-rw-r--r--cpukit/itron/configure.ac50
-rw-r--r--cpukit/itron/src/config.h5
4 files changed, 27 insertions, 61 deletions
diff --git a/cpukit/itron/ChangeLog b/cpukit/itron/ChangeLog
index e2b02f7bc0..5ab7ca23d1 100644
--- a/cpukit/itron/ChangeLog
+++ b/cpukit/itron/ChangeLog
@@ -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.
diff --git a/cpukit/itron/Makefile.am b/cpukit/itron/Makefile.am
index 556175d6d0..e53f6d0748 100644
--- a/cpukit/itron/Makefile.am
+++ b/cpukit/itron/Makefile.am
@@ -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
diff --git a/cpukit/itron/configure.ac b/cpukit/itron/configure.ac
deleted file mode 100644
index 1c400f4f66..0000000000
--- a/cpukit/itron/configure.ac
+++ /dev/null
@@ -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
-
diff --git a/cpukit/itron/src/config.h b/cpukit/itron/src/config.h
new file mode 100644
index 0000000000..09fe652e2c
--- /dev/null
+++ b/cpukit/itron/src/config.h
@@ -0,0 +1,5 @@
+/* HACK:
+ * Pull-in RTEMS global config-header cpuopts.h as local config.h
+ */
+
+#include <rtems/score/cpuopts.h>