summaryrefslogtreecommitdiffstats
path: root/cpukit/libfs
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-05-28 17:21:17 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-05-28 17:21:17 +0000
commit47ef863af4b71256d42a477fecef2f74e8ee8d4b (patch)
tree1e205fe2b094bd96ccdf9ca3dbfe3fb7ede79ee1 /cpukit/libfs
parent279ec4e8b5074c2354d923485b6c41103dfb8c15 (diff)
downloadrtems-47ef863af4b71256d42a477fecef2f74e8ee8d4b.tar.bz2
2002-05-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
Move from c/src/libfs to c/src/exec/libfs * configure.ac: Reflect move. * Makefile.am: Ditto. * src/Makefile.am: Ditto. * src/dosfs/Makefile.am: Ditto. * src/imfs/Makefile.am: Ditto. * wrapup/Makefile.am: Ditto.
Diffstat (limited to 'cpukit/libfs')
-rw-r--r--cpukit/libfs/ChangeLog10
-rw-r--r--cpukit/libfs/Makefile.am6
-rw-r--r--cpukit/libfs/configure.ac8
-rw-r--r--cpukit/libfs/src/Makefile.am4
-rw-r--r--cpukit/libfs/src/dosfs/Makefile.am8
-rw-r--r--cpukit/libfs/src/imfs/Makefile.am8
-rw-r--r--cpukit/libfs/wrapup/Makefile.am8
7 files changed, 30 insertions, 22 deletions
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog
index 2fd4267714..91b452cb77 100644
--- a/cpukit/libfs/ChangeLog
+++ b/cpukit/libfs/ChangeLog
@@ -1,3 +1,13 @@
+2002-05-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Move from c/src/libfs to c/src/exec/libfs
+ * configure.ac: Reflect move.
+ * Makefile.am: Ditto.
+ * src/Makefile.am: Ditto.
+ * src/dosfs/Makefile.am: Ditto.
+ * src/imfs/Makefile.am: Ditto.
+ * wrapup/Makefile.am: Ditto.
+
2002-04-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* src/imfs/imfs_getchild.c: include <string.h>.
diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am
index da1442fcfc..b24f15c4a4 100644
--- a/cpukit/libfs/Makefile.am
+++ b/cpukit/libfs/Makefile.am
@@ -2,11 +2,11 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../aclocal
+ACLOCAL_AMFLAGS = -I ../../../../aclocal
SUBDIRS = src wrapup
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/cpukit/libfs/configure.ac b/cpukit/libfs/configure.ac
index 5451ca5e3a..6e4dad8401 100644
--- a/cpukit/libfs/configure.ac
+++ b/cpukit/libfs/configure.ac
@@ -6,17 +6,15 @@ AC_PREREQ(2.52)
AC_INIT([rtems-c-src-libfs],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([src/imfs/imfs.h])
-RTEMS_TOP(../../..)
-AC_CONFIG_AUX_DIR(../../..)
+RTEMS_TOP(../../../..)
+AC_CONFIG_AUX_DIR(../../../..)
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define foreign 1.6])
AM_MAINTAINER_MODE
-RTEMS_ENABLE_BARE
-
-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU
RTEMS_CHECK_CPU
RTEMS_CANONICAL_HOST
diff --git a/cpukit/libfs/src/Makefile.am b/cpukit/libfs/src/Makefile.am
index 10582f188c..315c9e9bd6 100644
--- a/cpukit/libfs/src/Makefile.am
+++ b/cpukit/libfs/src/Makefile.am
@@ -5,5 +5,5 @@
SUBDIRS = imfs dosfs
-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/cpukit/libfs/src/dosfs/Makefile.am b/cpukit/libfs/src/dosfs/Makefile.am
index ad5e898689..f34b4776f5 100644
--- a/cpukit/libfs/src/dosfs/Makefile.am
+++ b/cpukit/libfs/src/dosfs/Makefile.am
@@ -3,9 +3,9 @@
##
-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
INCLUDES = -I../..
@@ -52,4 +52,4 @@ TMPINSTALL_FILES += $(H_FILES)
EXTRA_DIST = $(DOSFS_C_FILES) $(FATFS_C_FILES)
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/cpukit/libfs/src/imfs/Makefile.am b/cpukit/libfs/src/imfs/Makefile.am
index 855fa9f84f..87aa91b5aa 100644
--- a/cpukit/libfs/src/imfs/Makefile.am
+++ b/cpukit/libfs/src/imfs/Makefile.am
@@ -32,9 +32,9 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
include_HEADERS = imfs.h
-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
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
@@ -63,4 +63,4 @@ DOC_FILES = TODO CASES
EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \
$(UNIX_C_FILES)
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/cpukit/libfs/wrapup/Makefile.am b/cpukit/libfs/wrapup/Makefile.am
index 0ce22c6cb8..8dce90f71a 100644
--- a/cpukit/libfs/wrapup/Makefile.am
+++ b/cpukit/libfs/wrapup/Makefile.am
@@ -6,9 +6,9 @@
LIBNAME = libfs
LIB = $(ARCH)/$(LIBNAME).a
-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
IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a
@@ -39,4 +39,4 @@ all-local: $(ARCH) $(LIB) $(TMPINSTALL_FILES)
.PRECIOUS: $(LIB)
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am