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

2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* Makefile.am: Use SUBDIRS = @subdirs@, require automake-1.5.
	* configure.ac: Replace hst_subdirs with AC_CONFIG_SUBDIRS to make
	autoconf-2.52 happy.
This commit is contained in:
Joel Sherrill
2001-10-17 13:14:34 +00:00
parent 7660ccd8fc
commit 8dc51855b9
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/ChangeLog
View File

@@ -1,3 +1,9 @@
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use SUBDIRS = @subdirs@, require automake-1.5.
* configure.ac: Replace hst_subdirs with AC_CONFIG_SUBDIRS to make
autoconf-2.52 happy.
2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Add autom4te.cache for autoconf > 2.52.

4
c/src/Makefile.am
View File

@@ -2,10 +2,10 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
AUTOMAKE_OPTIONS = foreign 1.5
ACLOCAL_AMFLAGS = -I ../../aclocal
SUBDIRS = make @hst_subdirs@ wrapup tests
SUBDIRS = @subdirs@
# NOTE: The wildcard on the install should pick up everything except
# the tests directory. This significantly minimizes the install size.

23
c/src/configure.ac
View File

@@ -30,39 +30,36 @@ AC_CONFIG_SUBDIRS(make)
## Exclude exec from building if multilibs are enabled
if test x"$multilib" = x"no"; then
hst_subdirs="$hst_subdirs exec"
AC_CONFIG_SUBDIRS(exec)
fi
hst_subdirs="$hst_subdirs lib"
hst_subdirs="$hst_subdirs lib/libcpu"
hst_subdirs="$hst_subdirs lib/libbsp"
hst_subdirs="$hst_subdirs libfs"
hst_subdirs="$hst_subdirs libmisc"
AC_CONFIG_SUBDIRS(lib)
AC_CONFIG_SUBDIRS(lib/libcpu)
AC_CONFIG_SUBDIRS(lib/libbsp)
AC_CONFIG_SUBDIRS(libfs)
AC_CONFIG_SUBDIRS(libmisc)
if test "$RTEMS_CPU" != "unix"; then
## HACK: Suppress libchip for unix
hst_subdirs="$hst_subdirs libchip"
AC_CONFIG_SUBDIRS(libchip)
fi
if test "$HAS_NETWORKING" = "yes"; then
hst_subdirs="$hst_subdirs libnetworking librpc"
AC_CONFIG_SUBDIRS(libnetworking librpc)
if test "$RTEMS_HAS_RDBG" = "yes"; then
RTEMS_CHECK_RDBG(RTEMS_BSP)
fi
fi
if test "$HAS_RDBG" = "yes"; then
hst_subdirs="$hst_subdirs librdbg"
AC_CONFIG_SUBDIRS(librdbg)
fi
AM_CONDITIONAL(HAS_NETWORKING, test "$HAS_NETWORKING" = "yes" )
AM_CONDITIONAL(HAS_RDBG, test "$HAS_RDBG" = "yes" )
if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
hst_subdirs="$hst_subdirs librtems++";
AC_CONFIG_SUBDIRS(librtems++)
fi
AC_CONFIG_SUBDIRS($hst_subdirs)
AC_SUBST(hst_subdirs)
AC_CONFIG_SUBDIRS(wrapup tests)
RTEMS_PROJECT_ROOT