summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-10-26 02:58:06 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-10-26 02:58:06 +0000
commitdd04e32a80a2cbfdaa7f0c0d5db44a99b46f10f6 (patch)
tree93a743b7d73679d2bdb8e1300fc3a1fded8ae507 /c
parent3f06778ed8f93c6d9ff65a72be7b40b47fb7f37a (diff)
downloadrtems-dd04e32a80a2cbfdaa7f0c0d5db44a99b46f10f6.tar.bz2
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de> to move
c/src/lib/libmisc to c/src/libmisc.
Diffstat (limited to 'c')
-rw-r--r--c/src/configure.in1
-rw-r--r--c/src/exec/libcsupport/Makefile.am2
-rw-r--r--c/src/lib/Makefile.am2
-rw-r--r--c/src/lib/configure.in2
-rw-r--r--c/src/libmisc/Makefile.am4
-rw-r--r--c/src/libmisc/configure.in6
6 files changed, 8 insertions, 9 deletions
diff --git a/c/src/configure.in b/c/src/configure.in
index b9dcc97020..cde422db48 100644
--- a/c/src/configure.in
+++ b/c/src/configure.in
@@ -27,6 +27,7 @@ RTEMS_CHECK_NETWORKING(RTEMS_BSP)
cfg_subdirs="make"
cfg_subdirs="$cfg_subdirs exec"
cfg_subdirs="$cfg_subdirs lib"
+cfg_subdirs="$cfg_subdirs libmisc"
if test "$HAS_NETWORKING" = "yes"; then
cfg_subdirs="$cfg_subdirs libnetworking librpc"
diff --git a/c/src/exec/libcsupport/Makefile.am b/c/src/exec/libcsupport/Makefile.am
index e588da2cc0..db61ed978e 100644
--- a/c/src/exec/libcsupport/Makefile.am
+++ b/c/src/exec/libcsupport/Makefile.am
@@ -9,7 +9,7 @@ if HAS_LIBCHIP
LIBCHIP = libchip
endif
-SUBDIRS = start include libmisc libc libcpu libbsp \
+SUBDIRS = start include libc libcpu libbsp \
$(LIBCHIP) $(LIBHWAPI)
include $(top_srcdir)/../../../automake/subdirs.am
diff --git a/c/src/lib/Makefile.am b/c/src/lib/Makefile.am
index e588da2cc0..db61ed978e 100644
--- a/c/src/lib/Makefile.am
+++ b/c/src/lib/Makefile.am
@@ -9,7 +9,7 @@ if HAS_LIBCHIP
LIBCHIP = libchip
endif
-SUBDIRS = start include libmisc libc libcpu libbsp \
+SUBDIRS = start include libc libcpu libbsp \
$(LIBCHIP) $(LIBHWAPI)
include $(top_srcdir)/../../../automake/subdirs.am
diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in
index dbb8bbd5e4..3a5a0ac5ff 100644
--- a/c/src/lib/configure.in
+++ b/c/src/lib/configure.in
@@ -66,8 +66,6 @@ fi
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
AM_CONDITIONAL(HAS_LIBCHIP,test "$RTEMS_CPU" != "unix")
-AC_CONFIG_SUBDIRS(libmisc)
-
AC_CONFIG_SUBDIRS($cfg_subdirs)
PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
diff --git a/c/src/libmisc/Makefile.am b/c/src/libmisc/Makefile.am
index 84f85738f8..9c5c5a3ce3 100644
--- a/c/src/libmisc/Makefile.am
+++ b/c/src/libmisc/Makefile.am
@@ -9,5 +9,5 @@ SUBDIRS = dumpbuf stackchk monitor cpuuse rtmonuse untar 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/c/src/libmisc/configure.in b/c/src/libmisc/configure.in
index eab7ab6016..b712aca4ec 100644
--- a/c/src/libmisc/configure.in
+++ b/c/src/libmisc/configure.in
@@ -4,12 +4,12 @@ dnl $Id$
AC_PREREQ(2.13)
AC_INIT(dumpbuf)
-RTEMS_TOP(../../../..)
-AC_CONFIG_AUX_DIR(../../../..)
+RTEMS_TOP(../../..)
+AC_CONFIG_AUX_DIR(../../..)
RTEMS_CANONICAL_TARGET_CPU
-AM_INIT_AUTOMAKE(rtems-c-src-lib-libmisc,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE(rtems-c-src-libmisc,$RTEMS_VERSION,no)
AM_MAINTAINER_MODE
RTEMS_ENABLE_MULTIPROCESSING