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

	Moving libmisc from rtems/c/src to rtems/cpukit.

	* Makefile.am: Reflect new path.
	* configure.ac: Reflect new path.
	Use RTEMS_ENV_RTEMSCPU instead of RTEMS_ENV_RTEMSBSP.
	Remove RTEMS_PROJECT_ROOT.
	* capture/Makefile.am: Reflect new path.
	Remove OBJS from all-local.
	* cpuuse/Makefile.am: Ditto.
	* devnull/Makefile.am: Ditto.
	* dummy/Makefile.am: Ditto.
	* dumpbuf/Makefile.am: Ditto.
	* monitor/Makefile.am: Ditto.
	* mw-fb/Makefile.am: Ditto.
	* rtmonuse/Makefile.am: Ditto.
	* serdbg/Makefile.am: Ditto.
	* shell/Makefile.am: Ditto.
	* stackchk/Makefile.am: Ditto.
	* untar/Makefile.am: Ditto.
	* wrapup/Makefile.am: Reflect new path.

16 files changed, 80 insertions, 59 deletions

diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog
index d60af1fd04..ed2704bf3a 100644
--- a/cpukit/libmisc/ChangeLog
+++ b/cpukit/libmisc/ChangeLog
@@ -1,3 +1,26 @@
+2002-12-12	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	Moving libmisc from rtems/c/src to rtems/cpukit.
+
+	* Makefile.am: Reflect new path.
+	* configure.ac: Reflect new path. 
+	Use RTEMS_ENV_RTEMSCPU instead of RTEMS_ENV_RTEMSBSP.
+	Remove RTEMS_PROJECT_ROOT.
+	* capture/Makefile.am: Reflect new path.
+	Remove OBJS from all-local.
+	* cpuuse/Makefile.am: Ditto.
+	* devnull/Makefile.am: Ditto.
+	* dummy/Makefile.am: Ditto.
+	* dumpbuf/Makefile.am: Ditto.
+	* monitor/Makefile.am: Ditto.
+	* mw-fb/Makefile.am: Ditto.
+	* rtmonuse/Makefile.am: Ditto.
+	* serdbg/Makefile.am: Ditto.
+	* shell/Makefile.am: Ditto.
+	* stackchk/Makefile.am: Ditto.
+	* untar/Makefile.am: Ditto.
+	* wrapup/Makefile.am: Reflect new path.
+
 2002-12-10	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CHECK_CUSTOM_BSP.
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index 70ef3980e3..faf9e9c5b9 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -2,12 +2,12 @@
 ##  $Id$
 ##
 
-ACLOCAL_AMFLAGS = -I ../../../aclocal
+ACLOCAL_AMFLAGS = -I ../aclocal
 
 SUBDIRS = capture cpuuse devnull dummy dumpbuf monitor mw-fb shell \
           rtmonuse serdbg stackchk 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/cpukit/libmisc/capture/Makefile.am b/cpukit/libmisc/capture/Makefile.am
index 51be2dab54..7e204a5651 100644
--- a/cpukit/libmisc/capture/Makefile.am
+++ b/cpukit/libmisc/capture/Makefile.am
@@ -14,8 +14,8 @@ include_rtems_HEADERS = capture.h capture-cli.h
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -32,10 +32,10 @@ $(LIB): $(OBJS)
 PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
     $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
-all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = README capture.c capture-cli.c
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/configure.ac b/cpukit/libmisc/configure.ac
index a25efd63f8..b45a400561 100644
--- a/cpukit/libmisc/configure.ac
+++ b/cpukit/libmisc/configure.ac
@@ -3,10 +3,10 @@
 ## $Id$
 
 AC_PREREQ(2.52)
-AC_INIT([rtems-c-src-libmisc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
+AC_INIT([rtems-cpukit-libmisc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([dumpbuf])
-RTEMS_TOP(../../..)
-AC_CONFIG_AUX_DIR(../../..)
+RTEMS_TOP(../..)
+AC_CONFIG_AUX_DIR(../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
@@ -15,12 +15,10 @@ AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_BARE
 
-RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU
 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
 
-RTEMS_PROJECT_ROOT
-
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
 
diff --git a/cpukit/libmisc/cpuuse/Makefile.am b/cpukit/libmisc/cpuuse/Makefile.am
index 5a1646ac01..f2f4ab1cbf 100644
--- a/cpukit/libmisc/cpuuse/Makefile.am
+++ b/cpukit/libmisc/cpuuse/Makefile.am
@@ -15,8 +15,8 @@ include_rtems_HEADERS = cpuuse.h
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -33,10 +33,10 @@ $(LIB): $(OBJS)
 PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
     $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
-all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = README cpuuse.c
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/devnull/Makefile.am b/cpukit/libmisc/devnull/Makefile.am
index 268b3d8fe9..50cf27b2db 100644
--- a/cpukit/libmisc/devnull/Makefile.am
+++ b/cpukit/libmisc/devnull/Makefile.am
@@ -15,8 +15,8 @@ include_rtems_HEADERS = devnull.h
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -33,10 +33,10 @@ $(LIB): $(OBJS)
 PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
     $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
-all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = devnull.c
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/dummy/Makefile.am b/cpukit/libmisc/dummy/Makefile.am
index ef3b1b1946..5ff23599ad 100644
--- a/cpukit/libmisc/dummy/Makefile.am
+++ b/cpukit/libmisc/dummy/Makefile.am
@@ -11,8 +11,8 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -23,10 +23,10 @@ $(LIB): $(OBJS)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel
 
-all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = README dummy.c
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/dumpbuf/Makefile.am b/cpukit/libmisc/dumpbuf/Makefile.am
index a87d1c5689..f1c3f29ef3 100644
--- a/cpukit/libmisc/dumpbuf/Makefile.am
+++ b/cpukit/libmisc/dumpbuf/Makefile.am
@@ -15,8 +15,8 @@ include_rtems_HEADERS = dumpbuf.h
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -33,10 +33,10 @@ $(LIB): $(OBJS)
 PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
     $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
-all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = dumpbuf.c
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/monitor/Makefile.am b/cpukit/libmisc/monitor/Makefile.am
index 1b4af5b290..eb39a2e1f4 100644
--- a/cpukit/libmisc/monitor/Makefile.am
+++ b/cpukit/libmisc/monitor/Makefile.am
@@ -25,8 +25,8 @@ include_rtems_HEADERS = monitor.h symbols.h
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	$(mkinstalldirs) $@
@@ -43,7 +43,7 @@ $(LIB): $(OBJS)
 PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
     $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
-all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
 .PRECIOUS: $(LIB)
 
@@ -52,4 +52,4 @@ EXTRA_DIST = README mon-command.c mon-config.c mon-dname.c mon-driver.c \
     mon-object.c mon-prmisc.c mon-queue.c mon-server.c mon-symbols.c \
     mon-task.c
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/mw-fb/Makefile.am b/cpukit/libmisc/mw-fb/Makefile.am
index c8c18355a9..87a1d8314d 100644
--- a/cpukit/libmisc/mw-fb/Makefile.am
+++ b/cpukit/libmisc/mw-fb/Makefile.am
@@ -16,8 +16,8 @@ include_rtems_HEADERS = mw_fb.h mw_uid.h
 SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -40,4 +40,4 @@ all-local: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
 
 EXTRA_DIST = $(C_FILES)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/rtmonuse/Makefile.am b/cpukit/libmisc/rtmonuse/Makefile.am
index 1938831cf9..5cfe494ea3 100644
--- a/cpukit/libmisc/rtmonuse/Makefile.am
+++ b/cpukit/libmisc/rtmonuse/Makefile.am
@@ -15,8 +15,8 @@ include_rtems_HEADERS = rtmonuse.h
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -33,10 +33,10 @@ $(LIB): $(OBJS)
 PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
     $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
-all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = rtmonuse.c
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/serdbg/Makefile.am b/cpukit/libmisc/serdbg/Makefile.am
index 8c3cd13602..adb807d433 100644
--- a/cpukit/libmisc/serdbg/Makefile.am
+++ b/cpukit/libmisc/serdbg/Makefile.am
@@ -16,8 +16,8 @@ include_HEADERS = serdbgcnf.h serdbg.h termios_printk_cnf.h \
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 $(PROJECT_INCLUDE):
 	@$(mkinstalldirs) $@
@@ -34,11 +34,11 @@ $(LIB): $(OBJS)
 PREINSTALL_FILES = $(PROJECT_INCLUDE) \
     $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
-all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = README serdbg.c serdbgio.c serdbgcnf.h serdbg.h \
              termios_printk.c termios_printk.h termios_printk_cnf.h
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/shell/Makefile.am b/cpukit/libmisc/shell/Makefile.am
index b1ef9c5574..90f7b78e60 100644
--- a/cpukit/libmisc/shell/Makefile.am
+++ b/cpukit/libmisc/shell/Makefile.am
@@ -17,8 +17,8 @@ endif
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -36,11 +36,11 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
     $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
 if RTEMS_LIBSHELL
-all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 endif
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = README shell.c cmds.c shell.h
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/stackchk/Makefile.am b/cpukit/libmisc/stackchk/Makefile.am
index b090b83c41..fae7dfbe28 100644
--- a/cpukit/libmisc/stackchk/Makefile.am
+++ b/cpukit/libmisc/stackchk/Makefile.am
@@ -16,8 +16,8 @@ include_rtems_HEADERS = stackchk.h
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -34,10 +34,10 @@ $(LIB): $(OBJS)
 PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
     $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
-all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = README check.c
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/untar/Makefile.am b/cpukit/libmisc/untar/Makefile.am
index 4b34ae3d9f..bb819230ef 100644
--- a/cpukit/libmisc/untar/Makefile.am
+++ b/cpukit/libmisc/untar/Makefile.am
@@ -15,8 +15,8 @@ include_rtems_HEADERS = untar.h
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -33,10 +33,10 @@ $(LIB): $(OBJS)
 PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
     $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
 
-all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = README untar.c
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/libmisc/wrapup/Makefile.am b/cpukit/libmisc/wrapup/Makefile.am
index 79e101618c..ca804a6b09 100644
--- a/cpukit/libmisc/wrapup/Makefile.am
+++ b/cpukit/libmisc/wrapup/Makefile.am
@@ -4,8 +4,8 @@
 
 LIB = $(ARCH)/libmisc.a
 
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 ## XXX temporarily remove this from the list because it causes a 
 ## XXX number of BSPs to not link "main(){}" used by autoconf
@@ -36,4 +36,4 @@ $(LIB): $(TMP_LIBS)
 
 all-local: $(ARCH) $(LIB)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am