summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-07-10 08:08:28 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-07-10 08:08:28 +0000
commit222f7bdad5c38e2ee6c863f713036c7ebc02cae6 (patch)
treef9c4905a6a73aecf0e49b931c096bab41d3adff0 /c/src
parent2003-07-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-222f7bdad5c38e2ee6c863f713036c7ebc02cae6.tar.bz2
2003-07-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove (Merged into ../configure.ac). * Makefile.am: Reflect having merged configure.ac into ../configure.ac
Diffstat (limited to 'c/src')
-rw-r--r--c/src/optman/ChangeLog6
-rw-r--r--c/src/optman/Makefile.am8
-rw-r--r--c/src/optman/configure.ac27
3 files changed, 9 insertions, 32 deletions
diff --git a/c/src/optman/ChangeLog b/c/src/optman/ChangeLog
index 9ae74acb0b..b42f7dee5b 100644
--- a/c/src/optman/ChangeLog
+++ b/c/src/optman/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Remove (Merged into ../configure.ac).
+ * Makefile.am:
+ Reflect having merged configure.ac into ../configure.ac
+
2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove AC_CONFIG_AUX_DIR.
diff --git a/c/src/optman/Makefile.am b/c/src/optman/Makefile.am
index 92997f5afe..e0f99135d6 100644
--- a/c/src/optman/Makefile.am
+++ b/c/src/optman/Makefile.am
@@ -2,10 +2,8 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../aclocal
-
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
sapi_C_FILES = sapi/no-ext.c sapi/no-io.c
OBJS = $(sapi_C_FILES:sapi/%.c=$(ARCH)/%.$(OBJEXT))
@@ -47,4 +45,4 @@ install-data-local: $(PGMS)
EXTRA_DIST = $(rtems_C_FILES) $(sapi_C_FILES)
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/optman/configure.ac b/c/src/optman/configure.ac
deleted file mode 100644
index 9330dff490..0000000000
--- a/c/src/optman/configure.ac
+++ /dev/null
@@ -1,27 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-##
-## $Id$
-
-AC_PREREQ(2.57)
-AC_INIT([rtems-c-src-optman],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
-AC_CONFIG_SRCDIR([rtems])
-RTEMS_TOP(../../..)
-
-RTEMS_CANONICAL_TARGET_CPU
-
-AM_INIT_AUTOMAKE([no-define foreign 1.7.2])
-AM_MAINTAINER_MODE
-
-RTEMS_ENV_RTEMSBSP
-
-RTEMS_CHECK_CPU
-RTEMS_CANONICAL_HOST
-
-RTEMS_PROJECT_ROOT
-
-RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
-RTEMS_CANONICALIZE_TOOLS
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT