Changeset f31a078 in rtems


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rb88e366 rf31a078  
     12002-08-22      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * score/include/Makefile.am: Remove cpuopt.h generation.
     4        * configure.ac: Correct package name.
     5        Don't build ada if POSIX is disabled.
     6        Generate cpuopt.h on the fly, filter out autoconf-2.53 PACKAGE crap.
     7
    182002-08-22      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29
  • cpukit/configure.ac

    rb88e366 rf31a078  
    44
    55AC_PREREQ(2.52)
    6 AC_INIT([rtems-c-src-exec],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
     6AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
    77AC_CONFIG_SRCDIR([score])
    88RTEMS_TOP(..)
     
    8686AC_ARG_ENABLE([ada],[enable ada support])
    8787AS_IF([test x"$enable_ada" = x"yes"],[
    88   AS_IF([test -d ${srcdir}/ada],[
     88  AS_IF([test x"$HAS_POSIX_API" = x"yes"],[
    8989    AC_CONFIG_SUBDIRS([ada])
    9090  ])
     
    109109)
    110110
    111 AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h)
     111
     112AM_CONFIG_HEADER([score/include/rtems/score/cpuopts-tmp.h],[
     113echo "/* target cpu dependent options file */"         >$tmp/config.h
     114echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h
     115echo                                                  >>$tmp/config.h
     116echo "#ifndef __CPU_OPTIONS_h"                        >>$tmp/config.h
     117echo "#define __CPU_OPTIONS_h"                        >>$tmp/config.h
     118echo                                                  >>$tmp/config.h
     119sed -e '/.*PACKAGE.*/d' score/include/rtems/score/cpuopts-tmp.h >> $tmp/config.h
     120echo                                                  >>$tmp/config.h
     121echo "#endif"                                         >>$tmp/config.h
     122AS_IF([cmp -s score/include/rtems/score/cpuopts.h $tmp/config.h 2>/dev/null],
     123  [AC_MSG_NOTICE([score/include/rtems/score/cpuopts.h is unchanged])
     124   rm -f $tmp/config.h],
     125  [AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h])
     126   rm -f score/include/rtems/score/cpuopts.h
     127   mv $tmp/config.h score/include/rtems/score/cpuopts.h])
     128])
    112129
    113130AC_ENABLE_MULTILIB([Makefile],[..])
  • cpukit/score/include/Makefile.am

    rb88e366 rf31a078  
    4747    $(include_rtems_score_HEADERS:%=$(PROJECT_INCLUDE)/%)
    4848
    49 # make the cpu dependent options file
    50 # FIXME: We are exporting a config-header here, which is a bad idea in
    51 # general
    52 rtems/score/cpuopts.h: rtems/score/cpuopts-tmp.h
    53         @echo "/* target cpu dependent options file */"        >$@
    54         @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@
    55         @echo                                                  >>$@
    56         @echo "#ifndef __CPU_OPTIONS_h"                        >>$@
    57         @echo "#define __CPU_OPTIONS_h"                        >>$@
    58         @echo                                                  >>$@
    59         @cat rtems/score/cpuopts-tmp.h | sed -e '/.*PACKAGE.*/d' >>$@
    60         @echo                                                  >>$@
    61         @echo "#endif"                                         >>$@
    62 
    6349all-local: $(PREINSTALL_FILES)
    6450
Note: See TracChangeset for help on using the changeset viewer.