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

2002-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* score/include/Makefile.am: Remove cpuopt.h generation.
	* configure.ac: Correct package name.
	Don't build ada if POSIX is disabled.
	Generate cpuopt.h on the fly, filter out autoconf-2.53 PACKAGE crap.
This commit is contained in:
Ralf Corsepius
2002-08-29 15:59:05 +00:00
parent b88e3662e2
commit f31a0787b3
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cpukit/ChangeLog
View File

@@ -1,3 +1,10 @@
2002-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* score/include/Makefile.am: Remove cpuopt.h generation.
* configure.ac: Correct package name.
Don't build ada if POSIX is disabled.
Generate cpuopt.h on the fly, filter out autoconf-2.53 PACKAGE crap.
2002-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-08-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/prog-gnat.m4: New. * aclocal/prog-gnat.m4: New.

23
cpukit/configure.ac
View File

@@ -3,7 +3,7 @@
## $Id$ ## $Id$
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_INIT([rtems-c-src-exec],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([score]) AC_CONFIG_SRCDIR([score])
RTEMS_TOP(..) RTEMS_TOP(..)
AC_CONFIG_AUX_DIR(..) AC_CONFIG_AUX_DIR(..)
@@ -85,7 +85,7 @@ AM_CONDITIONAL(LIBRPC,[test "$LIBRPC" = "yes"])
AC_ARG_ENABLE([ada],[enable ada support]) AC_ARG_ENABLE([ada],[enable ada support])
AS_IF([test x"$enable_ada" = x"yes"],[ AS_IF([test x"$enable_ada" = x"yes"],[
AS_IF([test -d ${srcdir}/ada],[ AS_IF([test x"$HAS_POSIX_API" = x"yes"],[
AC_CONFIG_SUBDIRS([ada]) AC_CONFIG_SUBDIRS([ada])
]) ])
]) ])
@@ -108,7 +108,24 @@ AS_IF([test x"${enable_unixlib}" = x"yes"],
[to indicate RTEMS using RTEMS's unixlib])] [to indicate RTEMS using RTEMS's unixlib])]
) )
AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h)
AM_CONFIG_HEADER([score/include/rtems/score/cpuopts-tmp.h],[
echo "/* target cpu dependent options file */" >$tmp/config.h
echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h
echo >>$tmp/config.h
echo "#ifndef __CPU_OPTIONS_h" >>$tmp/config.h
echo "#define __CPU_OPTIONS_h" >>$tmp/config.h
echo >>$tmp/config.h
sed -e '/.*PACKAGE.*/d' score/include/rtems/score/cpuopts-tmp.h >> $tmp/config.h
echo >>$tmp/config.h
echo "#endif" >>$tmp/config.h
AS_IF([cmp -s score/include/rtems/score/cpuopts.h $tmp/config.h 2>/dev/null],
[AC_MSG_NOTICE([score/include/rtems/score/cpuopts.h is unchanged])
rm -f $tmp/config.h],
[AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h])
rm -f score/include/rtems/score/cpuopts.h
mv $tmp/config.h score/include/rtems/score/cpuopts.h])
])
AC_ENABLE_MULTILIB([Makefile],[..]) AC_ENABLE_MULTILIB([Makefile],[..])

14
cpukit/score/include/Makefile.am
View File

@@ -46,20 +46,6 @@ endif
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
$(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%) $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
# make the cpu dependent options file
# FIXME: We are exporting a config-header here, which is a bad idea in
# general
rtems/score/cpuopts.h: rtems/score/cpuopts-tmp.h
@echo "/* target cpu dependent options file */" >$@
@echo "/* automatically generated -- DO NOT EDIT!! */" >>$@
@echo >>$@
@echo "#ifndef __CPU_OPTIONS_h" >>$@
@echo "#define __CPU_OPTIONS_h" >>$@
@echo >>$@
@cat rtems/score/cpuopts-tmp.h | sed -e '/.*PACKAGE.*/d' >>$@
@echo >>$@
@echo "#endif" >>$@
all-local: $(PREINSTALL_FILES) all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/automake/local.am include $(top_srcdir)/automake/local.am