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

Adaptations to automake-1.10.

Browse Source
This commit is contained in:
Ralf Corsepius
2006-10-19 14:08:08 +00:00
parent cb5148e753
commit a8340dc12c
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/aclocal/prog-ccas.m4
View File

@@ -3,6 +3,6 @@
AC_DEFUN([RTEMS_PROG_CCAS], AC_DEFUN([RTEMS_PROG_CCAS],
[ [
AC_REQUIRE([RTEMS_PROG_CC]) AC_REQUIRE([RTEMS_PROG_CC])
AC_SUBST(CCAS,["$CC"]) AM_PROG_AS
AC_SUBST(CCASFLAGS,["-DASM \$(CFLAGS) \$(INCLUDES)"]) AC_SUBST(RTEMS_CCASFLAGS,["-DASM"])
]) ])

2
c/src/aclocal/prog-cxx.m4
View File

@@ -18,6 +18,7 @@ dnl NOTE: This might be too restrictive
test -z "$CXX" \ test -z "$CXX" \
&& AC_MSG_ERROR([no acceptable c++ found in \$PATH]) && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
AC_PROG_CXX AC_PROG_CXX
AC_PROG_CXXCPP
if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then
AC_MSG_ERROR([***] AC_MSG_ERROR([***]
@@ -26,7 +27,6 @@ AC_PROG_CXX
[must both either be cross compilers or native compilers] [must both either be cross compilers or native compilers]
[Hint: If building a posix bsp: LD_LIBRARY_PATH?] ) [Hint: If building a posix bsp: LD_LIBRARY_PATH?] )
fi fi
else else
## Work-around to a bug in automake ## Work-around to a bug in automake
AM_CONDITIONAL([am__fastdepCXX],[false]) AM_CONDITIONAL([am__fastdepCXX],[false])

2
c/src/aclocal/rtems-top.m4
View File

@@ -1,7 +1,5 @@
dnl $Id$ dnl $Id$
m4_define([RTEMS_API],[4.7])
dnl dnl
dnl RTEMS_TOP($1) dnl RTEMS_TOP($1)
dnl dnl

4
c/src/aclocal/version.m4
View File

@@ -1,2 +1,4 @@
AC_DEFUN([RTEMS_VERSIONING], AC_DEFUN([RTEMS_VERSIONING],
m4_define([_RTEMS_VERSION],[4.6.99.3])) m4_define([_RTEMS_VERSION],[4.6.99.4]))
m4_define([RTEMS_API],[4.7])

8
c/src/automake/compile.am
View File

@@ -10,7 +10,7 @@ CPP = @CPP@ $(GCCSPECS)
CCAS = @CCAS@ $(GCCSPECS) CCAS = @CCAS@ $(GCCSPECS)
## ##
AM_CPPFLAGS = $(RTEMS_CPPFLAGS) AM_CPPFLAGS = @RTEMS_CPPFLAGS@
AM_CFLAGS = $(RTEMS_CFLAGS) AM_CFLAGS = @RTEMS_CFLAGS@
AM_CXXFLAGS = $(RTEMS_CFLAGS) AM_CXXFLAGS = @RTEMS_CFLAGS@
AM_CCASFLAGS = $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS) AM_CCASFLAGS = @RTEMS_CCASFLAGS@