From 9414746cca5d9441a55bccd12bcaa0eae690d14c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 8 Jul 2003 07:47:19 +0000 Subject: 2003-07-08 Ralf Corsepius * configure.ac: Remove (Merged into ../configure.ac). * Makefile.am: Reflect having merged configure.ac into ../configure.ac. --- cpukit/ada/ChangeLog | 6 ++++++ cpukit/ada/Makefile.am | 6 +++--- cpukit/ada/configure.ac | 26 -------------------------- 3 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 cpukit/ada/configure.ac (limited to 'cpukit/ada') diff --git a/cpukit/ada/ChangeLog b/cpukit/ada/ChangeLog index 775f98a4c9..49711d6ecd 100644 --- a/cpukit/ada/ChangeLog +++ b/cpukit/ada/ChangeLog @@ -1,3 +1,9 @@ +2003-07-08 Ralf Corsepius + + * configure.ac: Remove (Merged into ../configure.ac). + * Makefile.am: Reflect having merged configure.ac into + ../configure.ac. + 2003-03-06 Ralf Corsepius * configure.ac: Remove AC_CONFIG_AUX_DIR. diff --git a/cpukit/ada/Makefile.am b/cpukit/ada/Makefile.am index e0c2c91409..635f636352 100644 --- a/cpukit/ada/Makefile.am +++ b/cpukit/ada/Makefile.am @@ -2,8 +2,6 @@ # $Id$ # -ACLOCAL_AMFLAGS = -I ../aclocal - $(PROJECT_INCLUDE)/adainclude: $(mkinstalldirs) $@ $(PROJECT_INCLUDE)/adainclude/%: % @@ -11,6 +9,7 @@ $(PROJECT_INCLUDE)/adainclude/%: % adaincludedir = $(includedir)/adainclude +if RTEMS_ADA adainclude_HEADERS = rtems.adb rtems.ads adainclude_HEADERS += rtems-multiprocessing.adb rtems-multiprocessing.ads @@ -18,7 +17,8 @@ TMPINSTALL_FILES = \ $(PROJECT_INCLUDE)/adainclude \ $(adainclude_HEADERS:%=$(PROJECT_INCLUDE)/adainclude/%) \ $(nodist_adalib_HEADERS:%=$(PROJECT_INCLUDE)/adainclude/%) +endif all-local: $(TMPINSTALL_FILES) -include $(top_srcdir)/../automake/local.am +include $(top_srcdir)/automake/local.am diff --git a/cpukit/ada/configure.ac b/cpukit/ada/configure.ac deleted file mode 100644 index 9318ede351..0000000000 --- a/cpukit/ada/configure.ac +++ /dev/null @@ -1,26 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ(2.57) -AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) -AC_CONFIG_SRCDIR([rtems.adb]) -RTEMS_TOP(../..) - -RTEMS_CANONICAL_TARGET_CPU -RTEMS_CANONICAL_HOST - -AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2]) -AM_MAINTAINER_MODE - -RTEMS_ENABLE_MULTIPROCESSING -RTEMS_ENV_RTEMSCPU -RTEMS_CHECK_CPU - -# FIXME: For the moment, no reason to check for ada -# RTEMS_PROG_GNAT - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile]) - -AC_OUTPUT -- cgit v1.2.3