2002-05-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Relocate libcsupport from c/src/lib to c/src/exec/libcsupport.
	* configure.ac: Use ENV_RTEMSCPU. Reflect changed paths.
	* Makefile.am: Reflect changed paths.
	* src/Makefile.am: Reflect changed paths.
This commit is contained in:
Joel Sherrill
2002-05-17 18:32:22 +00:00
parent ae30735267
commit c8e972f57b
7 changed files with 29 additions and 34 deletions

View File

View File

@@ -2,11 +2,11 @@
## $Id$ ## $Id$
## ##
ACLOCAL_AMFLAGS = -I ../../../aclocal ACLOCAL_AMFLAGS = -I ../../../../aclocal
include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../../automake/multilib.am
SUBDIRS = . libc SUBDIRS = . src
include_HEADERS = include/chain.h include/console.h include/clockdrv.h \ include_HEADERS = include/chain.h include/console.h include/clockdrv.h \
include/iosupp.h include/ringbuf.h include/rtc.h \ include/iosupp.h include/ringbuf.h include/rtc.h \
@@ -87,5 +87,5 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \
## General stuff ## General stuff
all-local: $(PREINSTALL_FILES) all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am

View File

@@ -4,17 +4,15 @@
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_INIT([rtems-c-src-lib],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_INIT([rtems-c-src-lib],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([libc]) AC_CONFIG_SRCDIR([src])
RTEMS_TOP(../../..) RTEMS_TOP(../../../..)
AC_CONFIG_AUX_DIR(../../..) AC_CONFIG_AUX_DIR(../../../..)
RTEMS_CANONICAL_TARGET_CPU RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define foreign 1.6]) AM_INIT_AUTOMAKE([no-define foreign 1.6])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSCPU
RTEMS_ENV_RTEMSBSP
RTEMS_CHECK_CPU RTEMS_CHECK_CPU
RTEMS_CANONICAL_HOST RTEMS_CANONICAL_HOST
@@ -25,15 +23,14 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS RTEMS_CANONICALIZE_TOOLS
RTEMS_CHECK_NEWLIB RTEMS_CHECK_NEWLIB
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING
RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
AM_CONDITIONAL(UNIX,test x"$RTEMS_CPU" = x"unix") AM_CONDITIONAL(UNIX,test x"$RTEMS_CPU" = x"unix")
AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes") AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes")
AM_CONFIG_HEADER(libc/config.h) AM_CONFIG_HEADER(src/config.h)
# Explicitly list all Makefiles here # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
libc/Makefile]) src/Makefile])
AC_OUTPUT AC_OUTPUT

View File

@@ -2,9 +2,9 @@
## $Id$ ## $Id$
## ##
include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../../automake/multilib.am
include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am include $(top_srcdir)/../../../../automake/lib.am
LIBNAME = libcsupport LIBNAME = libcsupport
LIB = ${ARCH}/${LIBNAME}.a LIB = ${ARCH}/${LIBNAME}.a
@@ -86,4 +86,4 @@ DOC_FILES = TODO CASES
EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \
$(UNIX_C_FILES) $(UNIX_C_FILES)
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am

View File

@@ -0,0 +1 @@

View File

@@ -2,11 +2,11 @@
## $Id$ ## $Id$
## ##
ACLOCAL_AMFLAGS = -I ../../../aclocal ACLOCAL_AMFLAGS = -I ../../../../aclocal
include $(top_srcdir)/../../../automake/multilib.am include $(top_srcdir)/../../../../automake/multilib.am
SUBDIRS = . libc SUBDIRS = . src
include_HEADERS = include/chain.h include/console.h include/clockdrv.h \ include_HEADERS = include/chain.h include/console.h include/clockdrv.h \
include/iosupp.h include/ringbuf.h include/rtc.h \ include/iosupp.h include/ringbuf.h include/rtc.h \
@@ -87,5 +87,5 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \
## General stuff ## General stuff
all-local: $(PREINSTALL_FILES) all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am

View File

@@ -4,17 +4,15 @@
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_INIT([rtems-c-src-lib],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_INIT([rtems-c-src-lib],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([libc]) AC_CONFIG_SRCDIR([src])
RTEMS_TOP(../../..) RTEMS_TOP(../../../..)
AC_CONFIG_AUX_DIR(../../..) AC_CONFIG_AUX_DIR(../../../..)
RTEMS_CANONICAL_TARGET_CPU RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define foreign 1.6]) AM_INIT_AUTOMAKE([no-define foreign 1.6])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
RTEMS_ENABLE_BARE RTEMS_ENV_RTEMSCPU
RTEMS_ENV_RTEMSBSP
RTEMS_CHECK_CPU RTEMS_CHECK_CPU
RTEMS_CANONICAL_HOST RTEMS_CANONICAL_HOST
@@ -25,15 +23,14 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
RTEMS_CANONICALIZE_TOOLS RTEMS_CANONICALIZE_TOOLS
RTEMS_CHECK_NEWLIB RTEMS_CHECK_NEWLIB
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING
RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
AM_CONDITIONAL(UNIX,test x"$RTEMS_CPU" = x"unix") AM_CONDITIONAL(UNIX,test x"$RTEMS_CPU" = x"unix")
AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes") AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes")
AM_CONFIG_HEADER(libc/config.h) AM_CONFIG_HEADER(src/config.h)
# Explicitly list all Makefiles here # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
libc/Makefile]) src/Makefile])
AC_OUTPUT AC_OUTPUT