2003-08-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* configure.ac: Remove (Merged into ../../configure.ac).
	* Makefile.am: Reflect having merged configure.ac into
	../../configure.ac.
This commit is contained in:
Ralf Corsepius
2003-08-08 03:14:14 +00:00
parent fbd27c826f
commit 5710072a71
6 changed files with 20 additions and 89 deletions

View File

@@ -1,3 +1,9 @@
2003-08-08 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.

View File

@@ -2,17 +2,16 @@
## $Id$
##
ACLOCAL_AMFLAGS = -I ../../../../aclocal
# If we are building a "real" BSP, then we need to descend into the
# appropriate CPU specific directory. The bare BSP is a special
# case which can be built for any CPU and it resides at the same
# level as the CPUs. If we are building the bare BSP, then descend
# into that directory.
SUBDIRS = shared shmdr @subdirs@
SUBDIRS = shared shmdr @libbsp_cpu_subdir@
DIST_SUBDIRS = shared shmdr @libbsp_cpu_subdir@
EXTRA_DIST = MERGE.PROCEDURE bsp.am
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
include $(top_srcdir)/../../automake/subdirs.am
include $(top_srcdir)/../../automake/local.am

View File

@@ -1,45 +0,0 @@
## Process this file with autoconf to produce a configure script.
##
## $Id$
AC_PREREQ(2.57)
AC_INIT([rtems-c-src-lib-libbsp],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([README])
RTEMS_TOP(../../../..)
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define foreign 1.7.2])
AM_MAINTAINER_MODE
RTEMS_PROG_CC_FOR_TARGET
RTEMS_CANONICALIZE_TOOLS
RTEMS_ENABLE_BARE
RTEMS_ENV_RTEMSBSP
RTEMS_CHECK_CPU
RTEMS_CANONICAL_HOST
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
# Is there code where there should be for this BSP?
# The bare bsp is a special case as it is not under the RTEMS_CPU path
if test "$RTEMS_BSP_FAMILY" = "bare" ; then
AC_CONFIG_SUBDIRS([bare])
else
RTEMS_CPU_SUBDIRS
fi
AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
RTEMS_PROJECT_ROOT
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
shmdr/Makefile
shared/Makefile
shared/gdbstub/Makefile
shared/include/Makefile
])
AC_OUTPUT

View File

@@ -1,3 +1,9 @@
2003-08-08 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.

View File

@@ -2,27 +2,13 @@
## $Id$
##
ACLOCAL_AMFLAGS = -I ../../../../aclocal
noinst_HEADERS = shared/include/cache.h
noinst_HEADERS += shared/src/cache_aligned_malloc.c \
shared/src/cache_manager.c
SUBDIRS = @libcpu_cpu_subdir@
DIST_SUBDIRS = @libcpu_cpu_subdir@
SUBDIRS = @subdirs@
DIST_SUBDIRS = \
hppa1.1 \
i386 \
i960 \
m68k \
mips \
mips64orion \
powerpc \
sh \
shared \
sparc
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
include $(top_srcdir)/../../automake/subdirs.am
include $(top_srcdir)/../../automake/local.am

View File

@@ -1,21 +0,0 @@
## Process this file with autoconf to produce a configure script.
##
## $Id$
AC_PREREQ(2.57)
AC_INIT([rtems-c-src-lib-libcpu],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([README])
RTEMS_TOP(../../../..)
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define foreign 1.7.2])
AM_MAINTAINER_MODE
RTEMS_CHECK_CPU
RTEMS_CANONICAL_HOST
RTEMS_CPU_SUBDIRS
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
AC_OUTPUT