summaryrefslogtreecommitdiffstats
path: root/c/src/exec
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-05-28 17:21:09 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-05-28 17:21:09 +0000
commit279ec4e8b5074c2354d923485b6c41103dfb8c15 (patch)
treee4dcd18d3d08534b6eccc7824e8dc2e58c42ece1 /c/src/exec
parent2002-05-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-279ec4e8b5074c2354d923485b6c41103dfb8c15.tar.bz2
2002-05-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
Move from c/src/libblock to c/src/exec/libblock * configure.ac: Reflect move. * Makefile.am: Ditto. * include/Makefile.am: Ditto. * src/Makefile.am: Ditto.
Diffstat (limited to 'c/src/exec')
-rw-r--r--c/src/exec/libblock/ChangeLog8
-rw-r--r--c/src/exec/libblock/Makefile.am6
-rw-r--r--c/src/exec/libblock/configure.ac8
-rw-r--r--c/src/exec/libblock/include/Makefile.am2
-rw-r--r--c/src/exec/libblock/src/Makefile.am8
5 files changed, 19 insertions, 13 deletions
diff --git a/c/src/exec/libblock/ChangeLog b/c/src/exec/libblock/ChangeLog
index 0f3f896f65..334b3656fe 100644
--- a/c/src/exec/libblock/ChangeLog
+++ b/c/src/exec/libblock/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Move from c/src/libblock to c/src/exec/libblock
+ * configure.ac: Reflect move.
+ * Makefile.am: Ditto.
+ * include/Makefile.am: Ditto.
+ * src/Makefile.am: Ditto.
+
2002-04-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* src/ramdisk.c: include <string.h>.
diff --git a/c/src/exec/libblock/Makefile.am b/c/src/exec/libblock/Makefile.am
index 740f764d6a..ee557d4518 100644
--- a/c/src/exec/libblock/Makefile.am
+++ b/c/src/exec/libblock/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../../aclocal
SUBDIRS = include src
EXTRA_DIST = README
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../../../automake/subdirs.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/libblock/configure.ac b/c/src/exec/libblock/configure.ac
index f5bf09fa2e..99af3908d0 100644
--- a/c/src/exec/libblock/configure.ac
+++ b/c/src/exec/libblock/configure.ac
@@ -5,8 +5,8 @@
AC_PREREQ(2.52)
AC_INIT([rtems-c-src-libblock],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([src/bdbuf.c])
-RTEMS_TOP(../../..)
-AC_CONFIG_AUX_DIR(../../..)
+RTEMS_TOP(../../../..)
+AC_CONFIG_AUX_DIR(../../../..)
RTEMS_CANONICAL_TARGET_CPU
RTEMS_CANONICAL_HOST
@@ -14,11 +14,9 @@ RTEMS_CANONICAL_HOST
AM_INIT_AUTOMAKE([no-define foreign 1.6])
AM_MAINTAINER_MODE
-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU
RTEMS_CHECK_CPU
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_PROG_CC_FOR_TARGET
-RTEMS_ENABLE_BARE
RTEMS_CANONICALIZE_TOOLS
diff --git a/c/src/exec/libblock/include/Makefile.am b/c/src/exec/libblock/include/Makefile.am
index 7f8f8dc48f..7b54845bfb 100644
--- a/c/src/exec/libblock/include/Makefile.am
+++ b/c/src/exec/libblock/include/Makefile.am
@@ -19,4 +19,4 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
all-local: $(PREINSTALL_FILES)
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/libblock/src/Makefile.am b/c/src/exec/libblock/src/Makefile.am
index ead52c2ab3..8fd33f6bcd 100644
--- a/c/src/exec/libblock/src/Makefile.am
+++ b/c/src/exec/libblock/src/Makefile.am
@@ -13,9 +13,9 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
SRCS = $(C_FILES)
OBJS = $(C_O_FILES)
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../../../automake/multilib.am
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../../../automake/lib.am
AM_CFLAGS += $(LIBC_DEFINES)
@@ -29,4 +29,4 @@ $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am