summaryrefslogtreecommitdiffstats
path: root/aclocal
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-22 13:41:11 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-22 13:41:11 +0000
commit9608320702e8dba9947987cd34001824638c434e (patch)
tree4352f820543cb2755ff8d6cfa2d9a0e7d0fc7544 /aclocal
parentSmall patch (rtems-rc-19991117-5.diff) from Ralf Corsepius (diff)
downloadrtems-9608320702e8dba9947987cd34001824638c434e.tar.bz2
Patch rtems-rc-19991117-4.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
.. a major configuration cleanup ... major enhancement of automake support. ... and it contains a *major* breakthough: Automake support for libchip and libmisc *LEAF* directories. To implement this I have used several nasty tricks * The basical trick is to wrap an old Makefile.in's contents into a Makefile.am and still continue to use (i.e include) the old *.cfg files. * Replaced each INSTALL_IF_CHANGE and INSTALL_VARIANT with make dependencies * Add a gnu-make ifdef AUTOMAKE to main.cfg to avoid conflicts between automake and RTEMS make rules * Replaced each install:: and preinstall:: rule with make dependencies * Replaced SUB_DIRS with SUBDIRS in all Makefile.ins (Automake convention) * Removed each manually added autoconf substitution which automake performs automatically. This is not yet full automake support, because using the temporary installation directory, preinstallation in general and building variants are in contradiction to automake's basic working principles ... ... the new Makefile.ams work still somewhat clumsy ... nevertheless they work (quite well). WARNING: At first glance this patch is small, but * it affects the whole configuration system. * it opens the road to introducing automake to all Makefile.ins currently not being under automake control. JOEL> Does this remove or add any files? Both, all Makefile.ins below libchip and libmisc get replaced with Makefile.ams.
Diffstat (limited to '')
-rw-r--r--aclocal/check-cpu.m41
-rw-r--r--aclocal/check-multiprocessing.m41
-rw-r--r--aclocal/check-networking.m41
-rw-r--r--aclocal/check-posix.m41
-rw-r--r--aclocal/enable-rtemsbsp.m42
5 files changed, 2 insertions, 4 deletions
diff --git a/aclocal/check-cpu.m4 b/aclocal/check-cpu.m4
index e8f1bb96ed..b0b01117d1 100644
--- a/aclocal/check-cpu.m4
+++ b/aclocal/check-cpu.m4
@@ -5,7 +5,6 @@ AC_DEFUN(RTEMS_CHECK_CPU,
[dnl
AC_REQUIRE([RTEMS_TOP])
AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
-AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
# Is this a supported CPU?
AC_MSG_CHECKING([if cpu $RTEMS_CPU is supported])
diff --git a/aclocal/check-multiprocessing.m4 b/aclocal/check-multiprocessing.m4
index 05c66efa03..098b34a7a4 100644
--- a/aclocal/check-multiprocessing.m4
+++ b/aclocal/check-multiprocessing.m4
@@ -4,6 +4,7 @@ dnl
AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
[dnl
+AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
AC_REQUIRE([RTEMS_TOP])dnl
AC_REQUIRE([RTEMS_CHECK_CPU])dnl
AC_REQUIRE([RTEMS_ENABLE_MULTIPROCESSING])dnl
diff --git a/aclocal/check-networking.m4 b/aclocal/check-networking.m4
index cff88766d1..db3a0c60d3 100644
--- a/aclocal/check-networking.m4
+++ b/aclocal/check-networking.m4
@@ -4,7 +4,6 @@ AC_DEFUN(RTEMS_CHECK_NETWORKING,
[dnl
AC_REQUIRE([RTEMS_CHECK_CPU])dnl
AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
-AC_BEFORE([$0], [RTEMS_CHECK_RDBG])dnl
AC_CACHE_CHECK([whether BSP supports networking],
rtems_cv_HAS_NETWORKING,
diff --git a/aclocal/check-posix.m4 b/aclocal/check-posix.m4
index a49fd008d7..2a2091c1eb 100644
--- a/aclocal/check-posix.m4
+++ b/aclocal/check-posix.m4
@@ -2,6 +2,7 @@ dnl $Id$
dnl
AC_DEFUN(RTEMS_CHECK_POSIX_API,
[dnl
+AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl
AC_REQUIRE([RTEMS_CHECK_CPU])dnl
AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl
diff --git a/aclocal/enable-rtemsbsp.m4 b/aclocal/enable-rtemsbsp.m4
index 21b5abfd74..b686a185ed 100644
--- a/aclocal/enable-rtemsbsp.m4
+++ b/aclocal/enable-rtemsbsp.m4
@@ -21,8 +21,6 @@ AC_DEFUN(RTEMS_ENV_RTEMSBSP,
AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
AC_BEFORE([$0], [RTEMS_CHECK_CUSTOM_BSP])dnl
-AC_BEFORE([$0], [RTEMS_CHECK_MULTIPROCESSING])dnl
-AC_BEFORE([$0], [RTEMS_CHECK_POSIX_API])dnl
AC_MSG_CHECKING([for RTEMS_BSP])
AC_CACHE_VAL(rtems_cv_RTEMS_BSP,