2004-04-06 Ralf Corsepius <ralf_corsepius@rtems.org>

	* rtems/score/cpu.h: Remove unixsize.h.
	* configure.ac: Remove (Merged into$(top_srcdir)/configure.ac).
	* Makefile.am: Remove unixsize.h.
	Don't include multilib.am.
	Reflect merging configure.ac into $(top_srcdir)/configure.ac.

4 files changed, 11 insertions, 73 deletions

diff --git a/cpukit/score/cpu/unix/ChangeLog b/cpukit/score/cpu/unix/ChangeLog
index b0954559fc..eb53256af3 100644
--- a/cpukit/score/cpu/unix/ChangeLog
+++ b/cpukit/score/cpu/unix/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-06	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* rtems/score/cpu.h: Remove unixsize.h.
+	* configure.ac: Remove (Merged into$(top_srcdir)/configure.ac).
+	* Makefile.am: Remove unixsize.h.
+	Don't include multilib.am.
+	Reflect merging configure.ac into $(top_srcdir)/configure.ac.
+
 2004-03-30	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* cpu.c, rtems/score/cpu.h: Convert to using c99 fixed size types.
diff --git a/cpukit/score/cpu/unix/Makefile.am b/cpukit/score/cpu/unix/Makefile.am
index ca718d9e6f..77141de6a3 100644
--- a/cpukit/score/cpu/unix/Makefile.am
+++ b/cpukit/score/cpu/unix/Makefile.am
@@ -2,16 +2,13 @@
 ## $Id$
 ##
 
-ACLOCAL_AMFLAGS = -I ../../../aclocal
-
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/automake/compile.am
 
 AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES)
 
 include_rtems_scoredir = $(includedir)/rtems/score
 include_rtems_score_HEADERS = rtems/score/types.h rtems/score/cpu.h \
-    rtems/score/unix.h rtems/score/unixsize.h
+    rtems/score/unix.h
 
 EXTRA_LIBRARIES = libscorecpu.a
 CLEANFILES = libscorecpu.a
@@ -45,11 +42,7 @@ $(PROJECT_INCLUDE)/rtems/score/unix.h: rtems/score/unix.h $(PROJECT_INCLUDE)/rte
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/unix.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/unix.h
 
-$(PROJECT_INCLUDE)/rtems/score/unixsize.h: rtems/score/unixsize.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/unixsize.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/unixsize.h
-
 CLEANFILES += $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/score/cpu/unix/configure.ac b/cpukit/score/cpu/unix/configure.ac
deleted file mode 100644
index 547509189d..0000000000
--- a/cpukit/score/cpu/unix/configure.ac
+++ /dev/null
@@ -1,61 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-## 
-## $Id$
-
-AC_PREREQ(2.59)
-AC_INIT([rtems-cpukit-score-cpu-unix],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
-AC_CONFIG_SRCDIR([cpu.c])
-RTEMS_TOP([../../../..])
-
-RTEMS_CANONICAL_TARGET_CPU
-
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.8.1])
-AM_MAINTAINER_MODE
-
-RTEMS_ENV_RTEMSCPU
-
-RTEMS_PROG_CC_FOR_TARGET
-RTEMS_CANONICALIZE_TOOLS
-AC_PROG_RANLIB
-
-RTEMS_CHECK_NEWLIB
-RTEMS_CHECK_MULTIPROCESSING
-
-# The only use of System V IPC is the UNIX port when multiprocessing.
-AS_IF([test "$HAS_MP" = "yes"],
-  [RTEMS_CHECK_SYSV_UNIX])
-
-## The code fragment below had been used in tools/cpu/unix/gensize.c.
-## FIXME: 
-## * The pad very likely is not necessary.
-AC_CHECK_SIZEOF([CPU_CONTEXT],[],[
-#include <stdio.h>
-#include <setjmp.h>
-
-typedef struct {
-  jmp_buf     regs;
-  int         isr_level;
-  int         pad[4]; /* just in case */
-} CPU_CONTEXT;
-])
-
-AC_CONFIG_HEADERS([rtems/score/unixsize-tmp.h],[
-echo "/* automatically generated -- DO NOT EDIT!! */" >$tmp/config.h
-echo                                                  >>$tmp/config.h
-echo "#ifndef __rtems_score_unixsize_h"               >>$tmp/config.h
-echo "#define __rtems_score_unixsize_h"               >>$tmp/config.h
-echo                                                  >>$tmp/config.h
-sed -e '/.*PACKAGE.*/d' rtems/score/unixsize-tmp.h >> $tmp/config.h
-echo                                                  >>$tmp/config.h
-echo "#endif"                                         >>$tmp/config.h
-AS_IF([cmp -s rtems/score/unixsize.h $tmp/config.h 2>/dev/null],
-  [AC_MSG_NOTICE([rtems/score/unixsize.h is unchanged])
-   rm -f $tmp/config.h],
-  [AC_MSG_NOTICE([creating rtems/score/unixsize.h])
-   rm -f rtems/score/unixsize.h
-   mv $tmp/config.h rtems/score/unixsize.h])
-])
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/cpukit/score/cpu/unix/rtems/score/cpu.h b/cpukit/score/cpu/unix/rtems/score/cpu.h
index 0738d02bfc..848dda1e4a 100644
--- a/cpukit/score/cpu/unix/rtems/score/cpu.h
+++ b/cpukit/score/cpu/unix/rtems/score/cpu.h
@@ -24,8 +24,6 @@ extern "C" {
 #include <rtems/score/types.h>
 #endif
 
-#include <rtems/score/unixsize.h>
-
 #if defined(solaris2)
 #undef  _POSIX_C_SOURCE
 #define _POSIX_C_SOURCE 3