Changeset f31a078 in rtems

Timestamp:

Aug 29, 2002, 3:59:05 PM (17 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

af16d17d

Parents:

b88e366

Message:

2002-08-22 Ralf Corsepius <corsepiu@…>

• 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.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• score/include/Makefile.am (modified) (1 diff)

cpukit/ChangeLog

@@ +1 @@
+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>
 

cpukit/configure.ac

@@ -4 +4 @@
 
 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])
 RTEMS_TOP(..)
@@ -86 +86 @@
 AC_ARG_ENABLE([ada],[enable ada support])
 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])
   ])
@@ -109 +109 @@
 )
 
-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],[..])

cpukit/score/include/Makefile.am

@@ -47 +47 @@
     $(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)