diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-05-17 18:32:22 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-05-17 18:32:22 +0000 |
| commit | c8e972f57b6fb45269a3fab8034e81a54431227d (patch) | |
| tree | 0eae28cb59603bfaaaf3232891344b5b8f23a637 /cpukit/libcsupport | |
| parent | 2002-05-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-c8e972f57b6fb45269a3fab8034e81a54431227d.tar.bz2 | |
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.
Diffstat (limited to 'cpukit/libcsupport')
| -rw-r--r-- | cpukit/libcsupport/ChangeLog | 1 | ||||
| -rw-r--r-- | cpukit/libcsupport/Makefile.am | 10 | ||||
| -rw-r--r-- | cpukit/libcsupport/configure.ac | 17 |
3 files changed, 13 insertions, 15 deletions
diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/cpukit/libcsupport/ChangeLog @@ -0,0 +1 @@ + diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index fd44699989..d4d8283ace 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -2,11 +2,11 @@ ## $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/iosupp.h include/ringbuf.h include/rtc.h \ @@ -87,5 +87,5 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \ ## General stuff all-local: $(PREINSTALL_FILES) -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/libcsupport/configure.ac b/cpukit/libcsupport/configure.ac index 6b7379f1fc..a49364774e 100644 --- a/cpukit/libcsupport/configure.ac +++ b/cpukit/libcsupport/configure.ac @@ -4,17 +4,15 @@ AC_PREREQ(2.52) AC_INIT([rtems-c-src-lib],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) -AC_CONFIG_SRCDIR([libc]) -RTEMS_TOP(../../..) -AC_CONFIG_AUX_DIR(../../..) +AC_CONFIG_SRCDIR([src]) +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 @@ -25,15 +23,14 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_NEWLIB -RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) +RTEMS_CHECK_MULTIPROCESSING AM_CONDITIONAL(UNIX,test x"$RTEMS_CPU" = x"unix") 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 AC_CONFIG_FILES([Makefile -libc/Makefile]) +src/Makefile]) AC_OUTPUT |