summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
Diffstat (limited to 'c')
-rw-r--r--c/src/exec/itron/src/Makefile.am70
-rw-r--r--c/src/exec/itron/src/Makefile.in86
-rw-r--r--c/src/exec/posix/Makefile.am2
-rw-r--r--c/src/exec/posix/include/Makefile.am5
-rw-r--r--c/src/exec/posix/include/rtems/posix/Makefile.am18
-rw-r--r--c/src/exec/posix/inline/rtems/posix/Makefile.am2
-rw-r--r--c/src/exec/posix/optman/Makefile.am22
-rw-r--r--c/src/exec/posix/optman/Makefile.in58
-rw-r--r--c/src/exec/posix/src/Makefile.am109
-rw-r--r--c/src/exec/posix/src/Makefile.in133
-rw-r--r--c/src/exec/rtems/include/rtems/rtems/Makefile.am16
-rw-r--r--c/src/exec/rtems/macros/rtems/rtems/Makefile.am5
-rw-r--r--c/src/exec/rtems/optman/Makefile.am40
-rw-r--r--c/src/exec/rtems/optman/Makefile.in61
-rw-r--r--c/src/exec/rtems/src/Makefile.am79
-rw-r--r--c/src/exec/rtems/src/Makefile.in95
-rw-r--r--c/src/exec/sapi/macros/rtems/Makefile.am2
-rw-r--r--c/src/exec/sapi/optman/Makefile.am39
-rw-r--r--c/src/exec/sapi/optman/Makefile.in58
-rw-r--r--c/src/exec/sapi/src/Makefile.am28
-rw-r--r--c/src/exec/sapi/src/Makefile.in51
-rw-r--r--c/src/exec/score/cpu/Makefile.in19
-rw-r--r--c/src/exec/score/cpu/a29k/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/a29k/rtems/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/a29k/rtems/score/Makefile.in74
-rw-r--r--c/src/exec/score/cpu/a29k/wrap/Makefile.in90
-rw-r--r--c/src/exec/score/cpu/i386/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/i386/rtems/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/i386/rtems/score/Makefile.in74
-rw-r--r--c/src/exec/score/cpu/i386/wrap/Makefile.in90
-rw-r--r--c/src/exec/score/cpu/i960/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/i960/rtems/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/i960/rtems/score/Makefile.in74
-rw-r--r--c/src/exec/score/cpu/i960/wrap/Makefile.in90
-rw-r--r--c/src/exec/score/cpu/m68k/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/m68k/rtems/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/m68k/rtems/score/Makefile.in74
-rw-r--r--c/src/exec/score/cpu/m68k/wrap/Makefile.in90
-rw-r--r--c/src/exec/score/cpu/mips64orion/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/mips64orion/rtems/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in74
-rw-r--r--c/src/exec/score/cpu/mips64orion/wrap/Makefile.in90
-rw-r--r--c/src/exec/score/cpu/no_cpu/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/no_cpu/rtems/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in75
-rw-r--r--c/src/exec/score/cpu/no_cpu/wrap/Makefile.in91
-rw-r--r--c/src/exec/score/cpu/powerpc/Makefile.in33
-rw-r--r--c/src/exec/score/cpu/powerpc/mpc750/Makefile.in90
-rw-r--r--c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in90
-rw-r--r--c/src/exec/score/cpu/powerpc/shared/Makefile.in83
-rw-r--r--c/src/exec/score/cpu/powerpc/wrap/Makefile.in90
-rw-r--r--c/src/exec/score/cpu/sh/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/sh/rtems/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/sh/rtems/score/Makefile.in75
-rw-r--r--c/src/exec/score/cpu/sh/wrap/Makefile.in90
-rw-r--r--c/src/exec/score/cpu/sparc/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/sparc/rtems/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/sparc/rtems/score/Makefile.in74
-rw-r--r--c/src/exec/score/cpu/sparc/wrap/Makefile.in90
-rw-r--r--c/src/exec/score/cpu/unix/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/unix/rtems/Makefile.in25
-rw-r--r--c/src/exec/score/cpu/unix/rtems/score/Makefile.in82
-rw-r--r--c/src/exec/score/cpu/unix/wrap/Makefile.in89
-rw-r--r--c/src/exec/score/include/rtems/score/Makefile.am (renamed from c/src/exec/score/include/rtems/score/Makefile.in)66
-rw-r--r--c/src/exec/score/inline/rtems/score/Makefile.am18
-rw-r--r--c/src/exec/score/macros/rtems/score/Makefile.am23
-rw-r--r--c/src/exec/score/src/Makefile.am81
-rw-r--r--c/src/exec/score/src/Makefile.in96
-rw-r--r--c/src/exec/wrapup/itron/Makefile.am36
-rw-r--r--c/src/exec/wrapup/itron/Makefile.in58
-rw-r--r--c/src/exec/wrapup/posix/Makefile.am36
-rw-r--r--c/src/exec/wrapup/posix/Makefile.in58
-rw-r--r--c/src/exec/wrapup/rtems/Makefile.am36
-rw-r--r--c/src/exec/wrapup/rtems/Makefile.in64
-rw-r--r--c/src/optman/rtems/Makefile.am40
-rw-r--r--c/src/optman/sapi/Makefile.am39
76 files changed, 755 insertions, 3216 deletions
diff --git a/c/src/exec/itron/src/Makefile.am b/c/src/exec/itron/src/Makefile.am
new file mode 100644
index 0000000000..7e5d47eee2
--- /dev/null
+++ b/c/src/exec/itron/src/Makefile.am
@@ -0,0 +1,70 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+TASK_C_FILES = task.c cre_tsk.c del_tsk.c sta_tsk.c ext_tsk.c exd_tsk.c \
+ ter_tsk.c dis_dsp.c ena_dsp.c chg_pri.c rot_rdq.c rel_wai.c get_tid.c \
+ ref_tsk.c
+
+TASKSYNC_C_FILES = sus_tsk.c rsm_tsk.c frsm_tsk.c slp_tsk.c tslp_tsk.c \
+ wup_tsk.c can_wup.c
+
+SEMAPHORE_C_FILES = itronsem.c cre_sem.c del_sem.c preq_sem.c ref_sem.c \
+ sig_sem.c twai_sem.c wai_sem.c
+
+EVENTFLAGS_C_FILES = eventflags.c
+
+MAILBOX_C_FILES = mbox.c
+
+MSGBUFFER_C_FILES = msgbuffer.c msgbuffertranslatereturncode.c \
+ cre_mbf.c del_mbf.c prcv_mbf.c psnd_mbf.c rcv_mbf.c ref_mbf.c snd_mbf.c \
+ trcv_mbf.c tsnd_mbf.c
+
+RENDEZVOUS_C_FILES = port.c
+
+INTERRUPT_C_FILES = itronintr.c
+
+VARIABLE_MEMORY_POOL_C_FILES = vmempool.c
+
+FIXED_MEMORY_POOL_C_FILES = fmempool.c
+
+TIME_C_FILES = itrontime.c
+
+CONFIGURATION_C_FILES = sysmgmt.c
+
+NETWORK_C_FILES = network.c
+
+C_FILES = $(TASK_C_FILES) $(TASKSYNC_C_FILES) $(SEMAPHORE_C_FILES) \
+ $(EVENTFLAGS_C_FILES) $(MAILBOX_C_FILES) $(MSGBUFFER_C_FILES) \
+ $(RENDEZVOUS_C_FILES) $(INTERRUPT_C_FILES) \
+ $(VARIABLE_MEMORY_POOL_C_FILES) $(FIXED_MEMORY_POOL_C_FILES) \
+ $(TIME_C_FILES)
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../automake/lib.am
+
+AM_CPPFLAGS += -D__RTEMS_INSIDE__
+AM_CFLAGS += $(CFLAGS_OS_V)
+
+all: ${ARCH} ${OBJS}
+
+UNUSED_C_FILES = \
+cre_mbx.c del_mbx.c \
+mboxtranslatereturncode.c \
+network.c \
+prcv_mbx.c \
+rcv_mbx.c \
+ref_mbx.c \
+snd_mbx.c \
+sysmgmt.c \
+trcv_mbx.c
+
+EXTRA_DIST = $(C_FILES) $(UNUSED_C_FILES)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/itron/src/Makefile.in b/c/src/exec/itron/src/Makefile.in
deleted file mode 100644
index f83337774b..0000000000
--- a/c/src/exec/itron/src/Makefile.in
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = src
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-TASK_C_PIECES = task cre_tsk del_tsk sta_tsk ext_tsk exd_tsk ter_tsk \
- dis_dsp ena_dsp chg_pri rot_rdq rel_wai get_tid ref_tsk
-
-TASKSYNC_C_PIECES = sus_tsk rsm_tsk frsm_tsk slp_tsk tslp_tsk wup_tsk \
- can_wup
-
-SEMAPHORE_C_PIECES = itronsem cre_sem del_sem preq_sem ref_sem sig_sem \
- twai_sem wai_sem
-
-EVENTFLAGS_C_PIECES = eventflags
-
-MAILBOX_C_PIECES = mbox
-
-MSGBUFFER_C_PIECES = msgbuffer msgbuffertranslatereturncode \
- cre_mbf del_mbf prcv_mbf psnd_mbf rcv_mbf ref_mbf snd_mbf trcv_mbf \
- tsnd_mbf
-
-RENDEZVOUS_C_PIECES = port
-
-INTERRUPT_C_PIECES = itronintr
-
-VARIABLE_MEMORY_POOL_C_PIECES = vmempool
-
-FIXED_MEMORY_POOL_C_PIECES = fmempool
-
-TIME_C_PIECES = itrontime
-
-CONFIGURATION_C_PIECES = sysmgmt
-
-NETWORK_C_PIECES = network
-
-C_PIECES = $(TASK_C_PIECES) $(TASKSYNC_C_PIECES) $(SEMAPHORE_C_PIECES) \
- $(EVENTFLAGS_C_PIECES) $(MAILBOX_C_PIECES) $(MSGBUFFER_C_PIECES) \
- $(RENDEZVOUS_C_PIECES) $(INTERRUPT_C_PIECES) \
- $(VARIABLE_MEMORY_POOL_C_PIECES) $(FIXED_MEMORY_POOL_C_PIECES) \
- $(TIME_C_PIECES)
-
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES += -D__RTEMS_INSIDE__
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) ${OBJS}
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/Makefile.am b/c/src/exec/posix/Makefile.am
index 6de0e0c27e..81d6737629 100644
--- a/c/src/exec/posix/Makefile.am
+++ b/c/src/exec/posix/Makefile.am
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-SUBDIRS = include inline macros src
+SUBDIRS = include inline macros src optman
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/include/Makefile.am b/c/src/exec/posix/include/Makefile.am
index 01adb60973..4abe5df1ee 100644
--- a/c/src/exec/posix/include/Makefile.am
+++ b/c/src/exec/posix/include/Makefile.am
@@ -5,7 +5,8 @@
AUTOMAKE_OPTIONS = foreign 1.4
## RTEMS unistd.h needs to be checked against newlib's and removed
-#noinst_HEADERS= devctl.h intr.h
+UNUSED_H_FILES = devctl.h intr.h unistd.h
+
H_FILES = pthread.h sched.h aio.h mqueue.h semaphore.h
noinst_HEADERS = $(H_FILES)
@@ -25,7 +26,7 @@ profile-am: $(PREINSTALL_FILES)
SUBDIRS = rtems sys
-EXTRA_DIST = intr.h devctl.h
+EXTRA_DIST = $(UNUSED_H_FILES)
include $(top_srcdir)/../../../../automake/subdirs.am
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.am b/c/src/exec/posix/include/rtems/posix/Makefile.am
index 59bf3c281d..96b9bad59b 100644
--- a/c/src/exec/posix/include/rtems/posix/Makefile.am
+++ b/c/src/exec/posix/include/rtems/posix/Makefile.am
@@ -4,17 +4,21 @@
AUTOMAKE_OPTIONS = foreign 1.4
-if HAS_MP
-## We only build multiprocessing related files if HAS_MP was defined
MP_H_FILES = condmp.h mqueuemp.h mutexmp.h pthreadmp.h semaphoremp.h
-endif
-H_FILES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.h \
+STD_H_FILES = cancel.h cond.h config.h key.h mqueue.h mutex.h posixapi.h \
priority.h psignal.h pthread.h ptimer.h semaphore.h seterr.h threadsup.h \
time.h timer.h $(MP_H_FILES)
-#H_FILES= intr.h threadsup.h time.h
-noinst_HEADERS = $(H_FILES)
+UNUSED_H_FILES= intr.h threadsup.h
+
+if HAS_MP
+H_FILES = $(STD_H_FILES) $(MP_H_FILES)
+else
+H_FILES = $(STD_H_FILES)
+endif
+
+noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
PREINSTALL_FILES = \
$(PROJECT_INCLUDE)/rtems/posix \
@@ -29,4 +33,6 @@ all-am: $(PREINSTALL_FILES)
debug-am: $(PREINSTALL_FILES)
profile-am: $(PREINSTALL_FILES)
+EXTRA_DIST = $(UNUSED_H_FILES)
+
include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/inline/rtems/posix/Makefile.am b/c/src/exec/posix/inline/rtems/posix/Makefile.am
index be7b9cf367..89b3c87d3b 100644
--- a/c/src/exec/posix/inline/rtems/posix/Makefile.am
+++ b/c/src/exec/posix/inline/rtems/posix/Makefile.am
@@ -3,13 +3,13 @@
##
AUTOMAKE_OPTIONS = foreign 1.4
-if INLINE
#I_FILES= intr.inl
I_FILES = cond.inl key.inl mqueue.inl mutex.inl pthread.inl priority.inl \
semaphore.inl
noinst_HEADERS = $(I_FILES)
+if INLINE
PREINSTALL_FILES = \
$(PROJECT_INCLUDE)/rtems/posix \
$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/posix/%)
diff --git a/c/src/exec/posix/optman/Makefile.am b/c/src/exec/posix/optman/Makefile.am
new file mode 100644
index 0000000000..99da45f754
--- /dev/null
+++ b/c/src/exec/posix/optman/Makefile.am
@@ -0,0 +1,22 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES =
+H_FILES =
+
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+AM_CFLAGS += $(CFLAGS_OS_V)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/optman/Makefile.in b/c/src/exec/posix/optman/Makefile.in
deleted file mode 100644
index 99c6e49fcc..0000000000
--- a/c/src/exec/posix/optman/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = optman
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-C_FILES =
-
-H_FILES =
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) $(OBJS) $(PGMS)
- #$(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/posix/src/Makefile.am b/c/src/exec/posix/src/Makefile.am
new file mode 100644
index 0000000000..06509bd125
--- /dev/null
+++ b/c/src/exec/posix/src/Makefile.am
@@ -0,0 +1,109 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+# following are semi-implemented and untested
+UNUSED_C_FILES = devctl.c intr.c
+
+# These are really in the stand but not really functional
+BUILD_FOR_NOW_C_FILES = aio.c
+
+ENOSYS_C_FILES = execl.c execle.c execlp.c execv.c execve.c execvp.c fork.c \
+ pthreadatfork.c wait.c waitpid.c
+
+CANCEL_C_FILES = cancel.c cancelrun.c cleanuppop.c cleanuppush.c \
+ setcancelstate.c setcanceltype.c testcancel.c
+
+CONDITION_VARIABLE_C_FILES = cond.c condattrdestroy.c condattrgetpshared.c \
+ condattrinit.c condattrsetpshared.c condbroadcast.c \
+ conddefaultattributes.c conddestroy.c condinit.c condmp.c condsignal.c \
+ condsignalsupp.c condtimedwait.c condwait.c condwaitsupp.c
+
+ID_C_FILES = getegid.c geteuid.c getgid.c getgroups.c getlogin.c getpgrp.c \
+ getpid.c getppid.c getuid.c setpgid.c setsid.c
+
+KEY_C_FILES = key.c keycreate.c keydelete.c keygetspecific.c \
+ keyrundestructors.c keysetspecific.c
+
+MESSAGE_QUEUE_C_FILES = mqueue.c mqueueclose.c mqueuecreatesupp.c \
+ mqueuedeletesupp.c mqueuegetattr.c mqueuenametoid.c mqueuenotify.c \
+ mqueueopen.c mqueuereceive.c mqueuerecvsupp.c mqueuesend.c \
+ mqueuesendsupp.c mqueuesetattr.c mqueuetimedreceive.c mqueuetimedsend.c \
+ mqueueunlink.c
+MUTEX_C_FILES = mutex.c mutexattrdestroy.c mutexattrgetprioceiling.c \
+ mutexattrgetprotocol.c mutexattrgetpshared.c mutexattrinit.c \
+ mutexattrsetprioceiling.c mutexattrsetprotocol.c mutexattrsetpshared.c \
+ mutexdefaultattributes.c mutexdestroy.c mutexfromcorestatus.c \
+ mutexgetprioceiling.c mutexinit.c mutexlock.c mutexlocksupp.c mutexmp.c \
+ mutexsetprioceiling.c mutextimedlock.c mutextrylock.c mutexunlock.c
+
+PTHREAD_C_FILES = pthread.c pthreadsetcputime.c pthreadgetcputime.c \
+ pthreadgetcpuclockid.c pthreadonce.c pthreadequal.c pthreadself.c \
+ pthreadexit.c pthreaddetach.c pthreadjoin.c pthreadcreate.c \
+ pthreadattrsetdetachstate.c pthreadattrgetdetachstate.c \
+ pthreadattrgetstackaddr.c pthreadattrsetstackaddr.c \
+ pthreadattrgetstacksize.c pthreadattrsetstacksize.c pthreadattrinit.c \
+ pthreadattrdestroy.c pthreadsetschedparam.c pthreadgetschedparam.c \
+ pthreadattrsetschedparam.c pthreadattrgetschedparam.c \
+ pthreadattrgetschedpolicy.c pthreadattrsetschedpolicy.c \
+ pthreadattrgetinheritsched.c pthreadattrsetinheritsched.c \
+ pthreadattrgetscope.c pthreadattrsetscope.c
+
+PSIGNAL_C_FILES = psignal.c alarm.c kill.c killinfo.c pause.c \
+ psignalclearprocesssignals.c psignalsetprocesssignals.c \
+ psignalchecksignal.c psignalclearsignals.c psignalunblockthread.c \
+ pthreadkill.c pthreadsigmask.c sigaction.c sigaddset.c sigdelset.c \
+ sigemptyset.c sigfillset.c sigismember.c sigpending.c sigprocmask.c \
+ sigqueue.c sigsuspend.c sigtimedwait.c sigwait.c sigwaitinfo.c \
+ signal_2.c
+
+SEMAPHORE_C_FILES = semaphore.c semaphorecreatesupp.c semaphoredeletesupp.c \
+ semaphoremp.c semaphorenametoid.c semaphorewaitsupp.c semclose.c \
+ semdestroy.c semgetvalue.c seminit.c semopen.c sempost.c semtimedwait.c \
+ semtrywait.c semunlink.c semwait.c
+
+TIME_C_FILES = time.c posixtimespecsubtract.c posixtimespectointerval.c \
+ posixintervaltotimespec.c clockgetcpuclockid.c clockgetenableattr.c \
+ clockgetres.c clockgettime.c clocksetenableattr.c clocksettime.c \
+ nanosleep.c sleep.c
+
+# the timer manager needs to be split further but only after its
+# dependence on the Classic API Timer Manager is removed.
+TIMER_C_FILES = ptimer.c ptimer1.c
+
+C_FILES = adasupp.c $(CANCEL_C_FILES) $(CONDITION_VARIABLE_C_FILES) \
+ $(ID_C_FILES) $(KEY_C_FILES) $(MESSAGE_QUEUE_C_FILES) $(MUTEX_C_FILES) \
+ $(PTHREAD_C_FILES) $(PSIGNAL_C_FILES) sched.c $(SEMAPHORE_C_FILES) \
+ sysconf.c $(TIME_C_FILES) $(TIMER_C_FILES) types.c $(ENOSYS_C_FILES) \
+ $(BUILD_FOR_NOW_C_FILES) utsname.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D__RTEMS_INSIDE__
+AM_CFLAGS += $(CFLAGS_OS_V)
+
+all: ${ARCH} $(SRCS) ${OBJS}
+
+# temporary so we can see how many things are left to implement
+not:
+ grep -i NOT_IMPL $(C_FILES) | grep -v MP_NOT_IMPL
+ @echo
+ @echo
+ @echo
+ @echo `grep -i NOT_IMPL $(C_FILES) | grep -v MP_NOT_IMPL | wc -l ` places marked not implemented
+ @echo `wc -l $(C_FILES) | grep total` lines of C code to test
+
+EXTRA_DIST = $(C_FILES) $(UNUSED_C_FILES)
+
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/exec/posix/src/Makefile.in b/c/src/exec/posix/src/Makefile.in
deleted file mode 100644
index f6898b8be2..0000000000
--- a/c/src/exec/posix/src/Makefile.in
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = src
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# following are semi-implemented and untested
-# C_PIECES=aio cancel devctl intr utsname
-
-# These are really in the stand but not really functional
-BUILD_FOR_NOW_C_PIECES = aio
-
-ENOSYS_C_PIECES = execl execle execlp execv execve execvp fork pthreadatfork \
- wait waitpid
-
-CANCEL_C_PIECES= cancel cancelrun cleanuppop cleanuppush setcancelstate \
- setcanceltype testcancel
-
-CONDITION_VARIABLE_C_PIECES= cond condattrdestroy condattrgetpshared \
- condattrinit condattrsetpshared condbroadcast conddefaultattributes \
- conddestroy condinit condmp condsignal condsignalsupp condtimedwait \
- condwait condwaitsupp
-
-ID_C_PIECES= getegid geteuid getgid getgroups getlogin getpgrp getpid getppid \
- getuid setpgid setsid
-
-KEY_C_PIECES= key keycreate keydelete keygetspecific keyrundestructors \
- keysetspecific
-
-MESSAGE_QUEUE_C_PIECES= mqueue mqueueclose mqueuecreatesupp mqueuedeletesupp \
- mqueuegetattr mqueuenametoid mqueuenotify mqueueopen mqueuereceive \
- mqueuerecvsupp mqueuesend mqueuesendsupp mqueuesetattr \
- mqueuetimedreceive mqueuetimedsend mqueueunlink \
-
-MUTEX_C_PIECES= mutex mutexattrdestroy mutexattrgetprioceiling \
- mutexattrgetprotocol mutexattrgetpshared mutexattrinit \
- mutexattrsetprioceiling mutexattrsetprotocol mutexattrsetpshared \
- mutexdefaultattributes mutexdestroy mutexfromcorestatus \
- mutexgetprioceiling mutexinit mutexlock mutexlocksupp mutexmp \
- mutexsetprioceiling mutextimedlock mutextrylock mutexunlock
-
-PTHREAD_C_PIECES = pthread pthreadsetcputime pthreadgetcputime \
- pthreadgetcpuclockid pthreadonce pthreadequal pthreadself pthreadexit \
- pthreaddetach pthreadjoin pthreadcreate pthreadattrsetdetachstate \
- pthreadattrgetdetachstate pthreadattrgetstackaddr \
- pthreadattrsetstackaddr pthreadattrgetstacksize pthreadattrsetstacksize \
- pthreadattrinit pthreadattrdestroy pthreadsetschedparam \
- pthreadgetschedparam pthreadattrsetschedparam pthreadattrgetschedparam \
- pthreadattrgetschedpolicy pthreadattrsetschedpolicy \
- pthreadattrgetinheritsched pthreadattrsetinheritsched \
- pthreadattrgetscope pthreadattrsetscope
-
-PSIGNAL_C_PIECES = psignal alarm kill killinfo pause \
- psignalclearprocesssignals psignalsetprocesssignals \
- psignalchecksignal psignalclearsignals \
- psignalunblockthread pthreadkill \
- pthreadsigmask sigaction sigaddset sigdelset sigemptyset sigfillset \
- sigismember sigpending sigprocmask sigqueue sigsuspend sigtimedwait \
- sigwait sigwaitinfo signal_2
-
-SEMAPHORE_C_PIECES= semaphore semaphorecreatesupp semaphoredeletesupp \
- semaphoremp semaphorenametoid semaphorewaitsupp semclose semdestroy \
- semgetvalue seminit semopen sempost semtimedwait semtrywait \
- semunlink semwait
-
-TIME_C_PIECES= time posixtimespecsubtract posixtimespectointerval \
- posixintervaltotimespec clockgetcpuclockid clockgetenableattr \
- clockgetres clockgettime clocksetenableattr clocksettime nanosleep \
- sleep
-
-# the timer manager needs to be split further but only after its
-# dependence on the Classic API Timer Manager is removed.
-TIMER_C_PIECES=ptimer ptimer1
-
-C_PIECES = adasupp $(CANCEL_C_PIECES) $(CONDITION_VARIABLE_C_PIECES) \
- $(ID_C_PIECES) $(KEY_C_PIECES) $(MESSAGE_QUEUE_C_PIECES) \
- $(MUTEX_C_PIECES) $(PTHREAD_C_PIECES) \
- $(PSIGNAL_C_PIECES) sched $(SEMAPHORE_C_PIECES) sysconf \
- $(TIME_C_PIECES) $(TIMER_C_PIECES) types $(ENOSYS_C_PIECES) \
- $(BUILD_FOR_NOW_C_PIECES) utsname
-
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES += -D__RTEMS_INSIDE__
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) ${OBJS}
-
-# temporary so we can see how many things are left to implement
-not:
- grep -i NOT_IMPL $(C_FILES) | grep -v MP_NOT_IMPL
- @echo
- @echo
- @echo
- @echo `grep -i NOT_IMPL $(C_FILES) | grep -v MP_NOT_IMPL | wc -l ` places marked not implemented
- @echo `wc -l $(C_FILES) | grep total` lines of C code to test
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.am b/c/src/exec/rtems/include/rtems/rtems/Makefile.am
index 4afbdd0695..cbd214e1aa 100644
--- a/c/src/exec/rtems/include/rtems/rtems/Makefile.am
+++ b/c/src/exec/rtems/include/rtems/rtems/Makefile.am
@@ -5,20 +5,24 @@
AUTOMAKE_OPTIONS = foreign 1.4
## We only build multiprocessing related files if HAS_MP was defined
-if HAS_MP
MP_H_FILES = eventmp.h mp.h msgmp.h partmp.h regionmp.h semmp.h \
signalmp.h taskmp.h
-endif
-H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \
+STD_H_FILES = asr.h attr.h clock.h config.h dpmem.h event.h eventset.h intr.h \
message.h modes.h options.h part.h ratemon.h region.h rtemsapi.h sem.h \
- signal.h status.h support.h tasks.h timer.h types.h $(MP_H_FILES)
+ signal.h status.h support.h tasks.h timer.h types.h
+
+if HAS_MP
+H_FILES = $(STD_HFILES) $(MP_H_FILES)
+else
+H_FILES = $(STD_H_FILES)
+endif
-noinst_HEADERS = $(H_FILES)
+noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
PREINSTALL_FILES = \
$(PROJECT_INCLUDE)/rtems/rtems \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
+$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
$(PROJECT_INCLUDE)/rtems/rtems:
@$(mkinstalldirs) $@
diff --git a/c/src/exec/rtems/macros/rtems/rtems/Makefile.am b/c/src/exec/rtems/macros/rtems/rtems/Makefile.am
index f738254bfc..65e0594cfd 100644
--- a/c/src/exec/rtems/macros/rtems/rtems/Makefile.am
+++ b/c/src/exec/rtems/macros/rtems/rtems/Makefile.am
@@ -4,16 +4,17 @@
AUTOMAKE_OPTIONS = foreign 1.4
-if MACROS
I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
modes.inl options.inl part.inl ratemon.inl \
region.inl sem.inl status.inl support.inl tasks.inl timer.inl
noinst_HEADERS = $(I_FILES)
+if MACROS
+
PREINSTALL_FILES = \
$(PROJECT_INCLUDE)/rtems/rtems \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
+$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
$(PROJECT_INCLUDE)/rtems/rtems:
@$(mkinstalldirs) $@
diff --git a/c/src/exec/rtems/optman/Makefile.am b/c/src/exec/rtems/optman/Makefile.am
new file mode 100644
index 0000000000..163bd86c97
--- /dev/null
+++ b/c/src/exec/rtems/optman/Makefile.am
@@ -0,0 +1,40 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = no-dpmem.c no-event.c no-msg.c no-mp.c no-part.c no-region.c \
+ no-rtmon.c no-sem.c no-signal.c no-timer.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+TMPINSTALL_FILES = \
+$(PROJECT_RELEASE)/lib \
+$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
+
+$(PROJECT_RELEASE)/lib:
+ @$(mkinstalldirs) $@
+
+$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
+ $(INSTALL_DATA) $< $@
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+AM_CFLAGS += $(CFLAGS_OS_V)
+ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
+
+all: ${ARCH} $(TMPINSTALL_FILES)
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/rtems/optman/Makefile.in b/c/src/exec/rtems/optman/Makefile.in
deleted file mode 100644
index 10bff24c12..0000000000
--- a/c/src/exec/rtems/optman/Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = rtems/optman
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-C_FILES = no-dpmem.c no-event.c no-msg.c no-mp.c no-part.c no-region.c \
- no-rtmon.c no-sem.c no-signal.c no-timer.c
-
-S_FILES =
-
-H_FILES =
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES)
-
-PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) $(OBJS) $(PGMS)
- $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/rtems/src/Makefile.am b/c/src/exec/rtems/src/Makefile.am
new file mode 100644
index 0000000000..1752e16e4c
--- /dev/null
+++ b/c/src/exec/rtems/src/Makefile.am
@@ -0,0 +1,79 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+# We only build multiprocessing related files if HAS_MP was defined
+MP_C_FILES = eventmp.c mp.c msgmp.c partmp.c regionmp.c semmp.c signalmp.c \
+ taskmp.c
+
+TASK_C_FILES = tasks.c taskcreate.c taskdelete.c taskgetnote.c taskident.c \
+ taskinitusers.c taskissuspended.c taskmode.c taskrestart.c taskresume.c \
+ tasksetnote.c tasksetpriority.c taskstart.c tasksuspend.c \
+ taskwakeafter.c taskwakewhen.c taskvariableadd.c taskvariabledelete.c
+
+RATEMON_C_FILES = ratemon.c ratemoncancel.c ratemoncreate.c ratemondelete.c \
+ ratemongetstatus.c ratemonident.c ratemonperiod.c ratemontimeout.c
+
+INTR_C_FILES = intr.c intrbody.c intrcatch.c
+
+CLOCK_C_FILES = rtclock.c clockget.c clockset.c clocktick.c
+
+TIMER_C_FILES = rtemstimer.c timercancel.c timercreate.c timerdelete.c \
+ timerfireafter.c timerfirewhen.c timerident.c timerreset.c
+
+MESSAGE_QUEUE_C_FILES = msg.c msgqallocate.c msgqbroadcast.c msgqcreate.c \
+ msgqdelete.c msgqflush.c msgqgetnumberpending.c msgqident.c \
+ msgqreceive.c msgqsend.c msgqsubmit.c msgqtranslatereturncode.c \
+ msgqurgent.c
+
+SEMAPHORE_C_FILES = sem.c semcreate.c semdelete.c semident.c semobtain.c \
+ semrelease.c semflush.c semtranslatereturncode.c
+
+EVENT_C_FILES = event.c eventreceive.c eventseize.c eventsend.c \
+ eventsurrender.c eventtimeout.c
+
+SIGNAL_C_FILES = signal.c signalcatch.c signalsend.c
+
+REGION_C_FILES = region.c regioncreate.c regiondelete.c regionextend.c \
+ regiongetsegment.c regiongetsegmentsize.c regionident.c \
+ regionreturnsegment.c regionreturnsegment.c
+
+PARTITION_C_FILES = part.c partcreate.c partdelete.c partgetbuffer.c \
+ partident.c partreturnbuffer.c
+
+DPMEM_C_FILES = dpmem.c dpmemcreate.c dpmemdelete.c dpmemexternal2internal.c \
+ dpmemident.c dpmeminternal2external.c
+
+STD_C_FILES = attr.c $(TASK_C_FILES) $(RATEMON_C_FILES) $(INTR_C_FILES) \
+ $(CLOCK_C_FILES) $(TIMER_C_FILES) $(SEMAPHORE_C_FILES) \
+ $(MESSAGE_QUEUE_C_FILES) $(EVENT_C_FILES) $(SIGNAL_C_FILES) \
+ $(PARTITION_C_FILES) $(REGION_C_FILES) $(DPMEM_C_FILES)
+
+if HAS_MP
+C_FILES = $(STD_C_FILES) $(MP_C_FILES)
+else
+C_FILES = $(STD_C_FILES)
+endif
+
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D__RTEMS_INSIDE__
+AM_CFLAGS += $(CFLAGS_OS_V)
+
+all: ${ARCH} $(SRCS) ${OBJS}
+
+EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in
deleted file mode 100644
index a8ff531bcf..0000000000
--- a/c/src/exec/rtems/src/Makefile.in
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = rtems/src
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# We only build multiprocessing related files if HAS_MP was defined
-MP_C_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp
-MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V)
-
-TASK_C_PIECES = tasks taskcreate taskdelete taskgetnote taskident \
- taskinitusers taskissuspended taskmode taskrestart taskresume tasksetnote \
- tasksetpriority taskstart tasksuspend taskwakeafter taskwakewhen \
- taskvariableadd taskvariabledelete
-
-RATEMON_C_PIECES = ratemon ratemoncancel ratemoncreate ratemondelete \
- ratemongetstatus ratemonident ratemonperiod ratemontimeout
-
-INTR_C_PIECES = intr intrbody intrcatch
-
-CLOCK_C_PIECES = rtclock clockget clockset clocktick
-
-TIMER_C_PIECES = rtemstimer timercancel timercreate timerdelete \
- timerfireafter timerfirewhen timerident timerreset
-
-MESSAGE_QUEUE_C_PIECES = msg msgqallocate msgqbroadcast msgqcreate \
- msgqdelete msgqflush msgqgetnumberpending msgqident msgqreceive msgqsend \
- msgqsubmit msgqtranslatereturncode msgqurgent
-
-SEMAPHORE_C_PIECES = sem semcreate semdelete semident semobtain semrelease \
- semflush semtranslatereturncode
-
-EVENT_C_PIECES = event eventreceive eventseize eventsend eventsurrender \
- eventtimeout
-
-SIGNAL_C_PIECES = signal signalcatch signalsend
-
-REGION_C_PIECES = region regioncreate regiondelete regionextend \
- regiongetsegment regiongetsegmentsize regionident regionreturnsegment \
- regionreturnsegment
-
-PARTITION_C_PIECES = part partcreate partdelete partgetbuffer partident \
- partreturnbuffer
-
-DPMEM_C_PIECES = dpmem dpmemcreate dpmemdelete dpmemexternal2internal \
- dpmemident dpmeminternal2external
-
-C_PIECES = attr $(TASK_C_PIECES) $(RATEMON_C_PIECES) $(INTR_C_PIECES) \
- $(CLOCK_C_PIECES) $(TIMER_C_PIECES) $(SEMAPHORE_C_PIECES) \
- $(MESSAGE_QUEUE_C_PIECES) $(EVENT_C_PIECES) $(SIGNAL_C_PIECES) \
- $(PARTITION_C_PIECES) $(REGION_C_PIECES) $(DPMEM_C_PIECES) \
- $(MP_C_PIECES)
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-SRCS = $(C_FILES)
-OBJS = $(C_O_FILES)
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES += -D__RTEMS_INSIDE__
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) ${OBJS}
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/sapi/macros/rtems/Makefile.am b/c/src/exec/sapi/macros/rtems/Makefile.am
index 962bf5aec0..991f6865b2 100644
--- a/c/src/exec/sapi/macros/rtems/Makefile.am
+++ b/c/src/exec/sapi/macros/rtems/Makefile.am
@@ -4,11 +4,11 @@
AUTOMAKE_OPTIONS = foreign 1.4
-if MACROS
I_FILES = extension.inl
noinst_HEADERS = $(I_FILES)
+if MACROS
PREINSTALL_FILES = \
$(PROJECT_INCLUDE)/rtems \
$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
diff --git a/c/src/exec/sapi/optman/Makefile.am b/c/src/exec/sapi/optman/Makefile.am
new file mode 100644
index 0000000000..34b23d5f6c
--- /dev/null
+++ b/c/src/exec/sapi/optman/Makefile.am
@@ -0,0 +1,39 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = no-ext.c no-io.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+PGMNAME = $(C_FILES:%.c=%)
+PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+TMPINSTALL_FILES = \
+$(PROJECT_RELEASE)/lib \
+$(PGMNAME:%=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+AM_CFLAGS += $(CFLAGS_OS_V)
+ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems
+
+$(PROJECT_RELEASE)/lib:
+ $(mkinstalldirs) $@
+$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
+ $(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(TMPINSTALL_FILES)
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/sapi/optman/Makefile.in b/c/src/exec/sapi/optman/Makefile.in
deleted file mode 100644
index 3305f26eeb..0000000000
--- a/c/src/exec/sapi/optman/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = sapi/optman
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-C_FILES = no-ext.c no-io.c
-
-H_FILES =
-
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES) $(S_O_FILES)
-
-PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) $(OBJS) $(PGMS)
- $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/sapi/src/Makefile.am b/c/src/exec/sapi/src/Makefile.am
new file mode 100644
index 0000000000..d4c32b0ee7
--- /dev/null
+++ b/c/src/exec/sapi/src/Makefile.am
@@ -0,0 +1,28 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = debug.c entrytable.c extension.c fatal.c exinit.c io.c itronapi.c \
+ posixapi.c rtemsapi.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D__RTEMS_INSIDE__
+AM_CFLAGS += $(CFLAGS_OS_V)
+
+all: ${ARCH} ${OBJS}
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/sapi/src/Makefile.in b/c/src/exec/sapi/src/Makefile.in
deleted file mode 100644
index 102c7cd24a..0000000000
--- a/c/src/exec/sapi/src/Makefile.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = sapi/src
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-C_PIECES = debug entrytable extension fatal exinit io \
- itronapi posixapi rtemsapi
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-SRCS = $(C_FILES)
-OBJS = $(C_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES += -D__RTEMS_INSIDE__
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) ${OBJS}
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/Makefile.in b/c/src/exec/score/cpu/Makefile.in
index 1471cb849f..8dee6c701e 100644
--- a/c/src/exec/score/cpu/Makefile.in
+++ b/c/src/exec/score/cpu/Makefile.in
@@ -7,6 +7,11 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = .
+ACLOCAL = aclocal
+AUTOCONF = autoconf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ACLOCAL_AMFLAGS = -I @RTEMS_TOPdir@/aclocal
+
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
@@ -19,6 +24,20 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
SUBDIRS = $(RTEMS_CPU)
+# HACK: Don't let them fail here
+dist:
+distdir:
+
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(srcdir) && $(AUTOCONF)
+
diff --git a/c/src/exec/score/cpu/a29k/Makefile.in b/c/src/exec/score/cpu/a29k/Makefile.in
deleted file mode 100644
index 9d25ef141f..0000000000
--- a/c/src/exec/score/cpu/a29k/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = a29k
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = rtems wrap
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/a29k/rtems/Makefile.in b/c/src/exec/score/cpu/a29k/rtems/Makefile.in
deleted file mode 100644
index 7de8275a43..0000000000
--- a/c/src/exec/score/cpu/a29k/rtems/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = a29k/rtems
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in b/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in
deleted file mode 100644
index ce414bf93f..0000000000
--- a/c/src/exec/score/cpu/a29k/rtems/score/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = a29k/rtems/score
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# C source names, if any, go here -- minus the .c
-C_PIECES =
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = a29k.h a29ktypes.h cpu.h cpu_asm.h
-H_FILES = $(H_PIECES:%=$(srcdir)/%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS += $(BUILT_SOURCES)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-all: preinstall
-
-preinstall: $(INSTALLDIRS) $(H_FILES)
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/a29k/wrap/Makefile.in b/c/src/exec/score/cpu/a29k/wrap/Makefile.in
deleted file mode 100644
index dcdfd1d500..0000000000
--- a/c/src/exec/score/cpu/a29k/wrap/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = a29k/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = amd.ah asm.h cpu_asm.h pswmacro.ah register.ah
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES = cpu_asm sig
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS)
- $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/i386/Makefile.in b/c/src/exec/score/cpu/i386/Makefile.in
deleted file mode 100644
index 301ceb8459..0000000000
--- a/c/src/exec/score/cpu/i386/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = i386
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = rtems wrap
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/i386/rtems/Makefile.in b/c/src/exec/score/cpu/i386/rtems/Makefile.in
deleted file mode 100644
index 202c740086..0000000000
--- a/c/src/exec/score/cpu/i386/rtems/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = i386/rtems
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/i386/rtems/score/Makefile.in b/c/src/exec/score/cpu/i386/rtems/score/Makefile.in
deleted file mode 100644
index 1547a8544d..0000000000
--- a/c/src/exec/score/cpu/i386/rtems/score/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = i386/rtems/score
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# C source names, if any, go here -- minus the .c
-C_PIECES =
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = cpu.h i386.h i386types.h
-H_FILES = $(H_PIECES:%=$(srcdir)/%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS += $(BUILT_SOURCES)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-all: preinstall
-
-preinstall: $(INSTALLDIRS) $(H_FILES)
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/i386/wrap/Makefile.in b/c/src/exec/score/cpu/i386/wrap/Makefile.in
deleted file mode 100644
index a63ec140f8..0000000000
--- a/c/src/exec/score/cpu/i386/wrap/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = i386/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = asm.h
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES = cpu_asm
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS)
- $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/i960/Makefile.in b/c/src/exec/score/cpu/i960/Makefile.in
deleted file mode 100644
index a7d8e221d0..0000000000
--- a/c/src/exec/score/cpu/i960/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = i960
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = rtems wrap
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/i960/rtems/Makefile.in b/c/src/exec/score/cpu/i960/rtems/Makefile.in
deleted file mode 100644
index e16f379a56..0000000000
--- a/c/src/exec/score/cpu/i960/rtems/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = i960/rtems
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in b/c/src/exec/score/cpu/i960/rtems/score/Makefile.in
deleted file mode 100644
index fcc6c532e6..0000000000
--- a/c/src/exec/score/cpu/i960/rtems/score/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = i960/rtems/score
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# C source names, if any, go here -- minus the .c
-C_PIECES =
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = cpu.h i960.h i960types.h
-H_FILES = $(H_PIECES:%=$(srcdir)/%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS += $(BUILT_SOURCES)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-all: preinstall
-
-preinstall: $(INSTALLDIRS) $(H_FILES)
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/i960/wrap/Makefile.in b/c/src/exec/score/cpu/i960/wrap/Makefile.in
deleted file mode 100644
index 2b84329a97..0000000000
--- a/c/src/exec/score/cpu/i960/wrap/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = i960/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = asm.h i960RP.h
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES = cpu_asm rtems
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS)
- $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/m68k/Makefile.in b/c/src/exec/score/cpu/m68k/Makefile.in
deleted file mode 100644
index 13ba612f57..0000000000
--- a/c/src/exec/score/cpu/m68k/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = m68k
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = rtems wrap
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/m68k/rtems/Makefile.in b/c/src/exec/score/cpu/m68k/rtems/Makefile.in
deleted file mode 100644
index 5cc6fcd10c..0000000000
--- a/c/src/exec/score/cpu/m68k/rtems/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/rtems
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in
deleted file mode 100644
index 868e0af8cd..0000000000
--- a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = m68k/rtems/score
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# C source names, if any, go here -- minus the .c
-C_PIECES =
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = cpu.h m68k.h m68ktypes.h
-H_FILES = $(H_PIECES:%=$(srcdir)/%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS += $(BUILT_SOURCES)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-all: preinstall
-
-preinstall: $(INSTALLDIRS) $(H_FILES)
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/m68k/wrap/Makefile.in b/c/src/exec/score/cpu/m68k/wrap/Makefile.in
deleted file mode 100644
index 481a198aa5..0000000000
--- a/c/src/exec/score/cpu/m68k/wrap/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = m68k/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu memcpy
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = asm.h m68302.h m68360.h qsm.h sim.h
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES = cpu_asm
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS)
- $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/mips64orion/Makefile.in b/c/src/exec/score/cpu/mips64orion/Makefile.in
deleted file mode 100644
index f40d528e50..0000000000
--- a/c/src/exec/score/cpu/mips64orion/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = mips64orion
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = rtems wrap
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in b/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in
deleted file mode 100644
index 2ee69101d6..0000000000
--- a/c/src/exec/score/cpu/mips64orion/rtems/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = mips64orion/rtems
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in b/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in
deleted file mode 100644
index 570858e460..0000000000
--- a/c/src/exec/score/cpu/mips64orion/rtems/score/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = mips64orion/rtems/score
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# C source names, if any, go here -- minus the .c
-C_PIECES =
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = cpu.h mips64orion.h mipstypes.h
-H_FILES = $(H_PIECES:%=$(srcdir)/%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS += $(BUILT_SOURCES)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-all: preinstall
-
-preinstall: $(INSTALLDIRS) $(H_FILES)
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in b/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in
deleted file mode 100644
index 81327eb287..0000000000
--- a/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = mips64orion/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES = cpu_asm
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS)
- $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/no_cpu/Makefile.in b/c/src/exec/score/cpu/no_cpu/Makefile.in
deleted file mode 100644
index 7a9a785b50..0000000000
--- a/c/src/exec/score/cpu/no_cpu/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = no_cpu
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = rtems wrap
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in b/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in
deleted file mode 100644
index aff4d23703..0000000000
--- a/c/src/exec/score/cpu/no_cpu/rtems/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = no_cpu/rtems
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in b/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in
deleted file mode 100644
index 86ce179e40..0000000000
--- a/c/src/exec/score/cpu/no_cpu/rtems/score/Makefile.in
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = no_cpu/rtems/score
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# C source names, if any, go here -- minus the .c
-C_PIECES =
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = cpu.h no_cpu.h no_cputypes.h
-H_FILES = $(H_PIECES:%=$(srcdir)/%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS += $(BUILT_SOURCES)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-
-all: preinstall
-
-preinstall: $(INSTALLDIRS) $(H_FILES)
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in b/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in
deleted file mode 100644
index 9889b8daa7..0000000000
--- a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = no_cpu/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu cpu_asm
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = asm.h
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) $(OBJS) $(ARCH)/rtems.o $(RELS)
-
-$(ARCH)/rtems.o: rtems.c
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/powerpc/Makefile.in b/c/src/exec/score/cpu/powerpc/Makefile.in
deleted file mode 100644
index 73f5c47a02..0000000000
--- a/c/src/exec/score/cpu/powerpc/Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = powerpc
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SHARED_LIB = shared
-
-ifeq ($(RTEMS_CPU_MODEL),mpc750)
-CPUDIR = mpc750
-else
-CPUDIR = other_cpu
-endif
-
-SUBDIRS = $(CPUDIR) $(SHARED_LIB)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/powerpc/mpc750/Makefile.in b/c/src/exec/score/cpu/powerpc/mpc750/Makefile.in
deleted file mode 100644
index b50fbdc3d4..0000000000
--- a/c/src/exec/score/cpu/powerpc/mpc750/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/mpc750
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-ROOT_H_PIECES =
-ROOT_H_FILES = $(ROOT_H_PIECES:%=$(srcdir)/%)
-RTEMS_SCORE_H_PIECES = cpu.h
-RTEMS_SCORE_H_FILES = $(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%)
-H_PIECES = $(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES)
-H_FILES = $(H_PIECES%=$(srcdir)/%)
-I_PIECES = c_isr
-I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES = cpu_asm
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) \
- $(I_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(RTEMS_SCORE_H_FILES) $(I_FILES) $(PROJECT_INCLUDE)/rtems/score
- @$(INSTALL_CHANGE) -m 644 $(ROOT_H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in b/c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in
deleted file mode 100644
index 9e6f49591a..0000000000
--- a/c/src/exec/score/cpu/powerpc/other_cpu/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/other_cpu
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu ppccache
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-ROOT_H_PIECES =
-ROOT_H_FILES = $(ROOT_H_PIECES:%=$(srcdir)/%)
-RTEMS_SCORE_H_PIECES = cpu.h
-RTEMS_SCORE_H_FILES = $(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%)
-H_PIECES = $(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES)
-H_FILES = $(H_PIECES%=$(srcdir)/%)
-I_PIECES = c_isr
-I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES = cpu_asm rtems # irq_stub
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) \
- $(I_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(RTEMS_SCORE_H_FILES) $(I_FILES) $(PROJECT_INCLUDE)/rtems/score
- @$(INSTALL_CHANGE) -m 644 $(ROOT_H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/powerpc/shared/Makefile.in b/c/src/exec/score/cpu/powerpc/shared/Makefile.in
deleted file mode 100644
index 549777e59a..0000000000
--- a/c/src/exec/score/cpu/powerpc/shared/Makefile.in
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/shared
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-RELS =
-
-# C source names, if any, go here -- minus the .c
-C_PIECES =
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-ROOT_H_PIECES = asm.h
-ROOT_H_FILES = $(ROOT_H_PIECES:%=$(srcdir)/%)
-RTEMS_SCORE_H_PIECES = ppc.h ppctypes.h
-RTEMS_SCORE_H_FILES = $(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%)
-H_PIECES = $(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES)
-H_FILES = $(H_PIECES%=$(srcdir)/%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: $(SRCS) preinstall
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(RTEMS_SCORE_H_FILES) $(PROJECT_INCLUDE)/rtems/score
- @$(INSTALL_CHANGE) -m 644 $(ROOT_H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/powerpc/wrap/Makefile.in b/c/src/exec/score/cpu/powerpc/wrap/Makefile.in
deleted file mode 100644
index bb51eb394f..0000000000
--- a/c/src/exec/score/cpu/powerpc/wrap/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = powerpc/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu ppccache
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = asm.h mpc860.h mpc821.h
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES = cpu_asm rtems # irq_stub
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS)
- $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/sh/Makefile.in b/c/src/exec/score/cpu/sh/Makefile.in
deleted file mode 100644
index 820f1dcfc6..0000000000
--- a/c/src/exec/score/cpu/sh/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = sh
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = rtems wrap
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/sh/rtems/Makefile.in b/c/src/exec/score/cpu/sh/rtems/Makefile.in
deleted file mode 100644
index 0ce0681963..0000000000
--- a/c/src/exec/score/cpu/sh/rtems/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = sh/rtems
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/sh/rtems/score/Makefile.in b/c/src/exec/score/cpu/sh/rtems/score/Makefile.in
deleted file mode 100644
index 72b3471072..0000000000
--- a/c/src/exec/score/cpu/sh/rtems/score/Makefile.in
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = sh/rtems/score
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# C source names, if any, go here -- minus the .c
-C_PIECES =
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = cpu.h shtypes.h sh.h sh_io.h isp$(RTEMS_CPU_MODEL).h \
- io$(RTEMS_CPU_MODEL).h
-H_FILES = $(H_PIECES:%=$(srcdir)/%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS += $(BUILT_SOURCES)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-all: preinstall
-
-preinstall: $(INSTALLDIRS) $(H_FILES)
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/sh/wrap/Makefile.in b/c/src/exec/score/cpu/sh/wrap/Makefile.in
deleted file mode 100644
index 12fe6d5d06..0000000000
--- a/c/src/exec/score/cpu/sh/wrap/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = sh/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu cpu_asm isp$(RTEMS_CPU_MODEL)
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = asm.h
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS)
- $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/sparc/Makefile.in b/c/src/exec/score/cpu/sparc/Makefile.in
deleted file mode 100644
index 0d89a0f51b..0000000000
--- a/c/src/exec/score/cpu/sparc/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = sparc
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = rtems wrap
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/sparc/rtems/Makefile.in b/c/src/exec/score/cpu/sparc/rtems/Makefile.in
deleted file mode 100644
index 0cd9e3af8b..0000000000
--- a/c/src/exec/score/cpu/sparc/rtems/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = sparc/rtems
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in
deleted file mode 100644
index 8ab5f8f199..0000000000
--- a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = sparc/rtems/score
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-# C source names, if any, go here -- minus the .c
-C_PIECES =
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = cpu.h sparctypes.h sparc.h
-H_FILES = $(H_PIECES:%=$(srcdir)/%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS += $(BUILT_SOURCES)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-all: preinstall
-
-preinstall: $(INSTALLDIRS) $(H_FILES)
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/sparc/wrap/Makefile.in b/c/src/exec/score/cpu/sparc/wrap/Makefile.in
deleted file mode 100644
index 80fab41feb..0000000000
--- a/c/src/exec/score/cpu/sparc/wrap/Makefile.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = sparc/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = asm.h erc32.h
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES = cpu_asm
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS)
- $(INSTALL_VARIANT) -m 644 $(ARCH)/rtems.o $(PROJECT_RELEASE)/lib
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/unix/Makefile.in b/c/src/exec/score/cpu/unix/Makefile.in
deleted file mode 100644
index efef7da8aa..0000000000
--- a/c/src/exec/score/cpu/unix/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = unix
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = rtems wrap
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/unix/rtems/Makefile.in b/c/src/exec/score/cpu/unix/rtems/Makefile.in
deleted file mode 100644
index 8cc26059bd..0000000000
--- a/c/src/exec/score/cpu/unix/rtems/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = unix/rtems
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/directory.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SUBDIRS = score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/unix/rtems/score/Makefile.in b/c/src/exec/score/cpu/unix/rtems/score/Makefile.in
deleted file mode 100644
index 6e5eae9723..0000000000
--- a/c/src/exec/score/cpu/unix/rtems/score/Makefile.in
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = unix/rtems/score
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-GENSIZE = $(PROJECT_ROOT)/tools/cpu/unix/gensize
-
-BUILT_SOURCES = unixsize.h
-
-# C source names, if any, go here -- minus the .c
-C_PIECES =
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES = cpu.h unixtypes.h unix.h
-H_FILES = $(H_PIECES:%=$(srcdir)/%) unixsize.h
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-unixsize.h: $(GENSIZE) cpu.h
- $(RM) $@
- $(GENSIZE) > $@
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS += $(BUILT_SOURCES)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-all: preinstall
-
-preinstall: $(INSTALLDIRS) $(H_FILES)
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/cpu/unix/wrap/Makefile.in b/c/src/exec/score/cpu/unix/wrap/Makefile.in
deleted file mode 100644
index 70048cc925..0000000000
--- a/c/src/exec/score/cpu/unix/wrap/Makefile.in
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# $Id$
-#
-# *** NOTE *** This Makefile violates RTEMS Makefile standards.
-# This Makefile picks up sources from outside this directory
-# and installs relocatible objects outside of this directory.
-# This behavior is a work-around for RTEMS Makefile's missing
-# ability to compile inside of directories containing subdirectories.
-# This directory will disapear once automake will be introduced.
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = unix/wrap
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@/..
-
-RELS = ../$(ARCH)/rtems-cpu.rel
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = cpu
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_PIECES =
-H_FILES = $(H_PIECES:%=$(srcdir)/../%)
-
-# Assembly source names, if any, go here -- minus the .S
-S_PIECES =
-S_FILES = $(S_PIECES:%=%.S)
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES)
-OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES += -DCPU_SYNC_IO $(LIBC_DEFINES) @DEFS@
-CPPFLAGS += -I$(srcdir)/..
-CFLAGS += $(CFLAGS_OS_V)
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS += ../$(ARCH)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
-
-../$(ARCH)/rtems-cpu.rel: $(OBJS)
- test -d ../$(ARCH) || mkdir ../$(ARCH)
- $(make-rel)
-
-# Install the program(s), appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-install: all
-
-preinstall: ${ARCH}
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.am
index 9bcf5b808b..995cd3a01d 100644
--- a/c/src/exec/score/include/rtems/score/Makefile.in
+++ b/c/src/exec/score/include/rtems/score/Makefile.am
@@ -1,44 +1,37 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../../..
-subdir = score/include/rtems/score
+##
+## $Id$
+##
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
+AUTOMAKE_OPTIONS = foreign 1.4
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/leaf.cfg
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
- @$(mkinstalldirs) $(INSTALLDIRS)
-
# We only build multiprocessing related files if HAS_MP was defined
-MP_H_PIECES_yes_V = mpci mppkt objectmp threadmp
-MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V)
+MP_H_FILES = mpci.h mppkt.h objectmp.h threadmp.h
# H_FILES that get installed in the rtems/score subdirectoy
-H_PIECES = address apiext bitfield chain context copyrt coremsg coremutex \
- coresem heap interr isr object priority stack states sysstate thread \
- threadq tod tqdata userext watchdog wkspace $(MP_H_PIECES)
-H_FILES = $(H_PIECES:%=$(srcdir)/%.h)
+STD_H_FILES = address.h apiext.h bitfield.h chain.h context.h copyrt.h coremsg.h \
+ coremutex.h coresem.h heap.h interr.h isr.h object.h priority.h stack.h \
+ states.h sysstate.h thread.h threadq.h tod.h tqdata.h userext.h \
+ watchdog.h wkspace.h
TARGOPTS = targopts.h
-SRCS = $(H_FILES) $(TARGOPTS)
+if HAS_MP
+H_FILES = $(STD_H_FILES) $(TARGOPTS) $(MP_H_FILES)
+else
+H_FILES = $(STD_H_FILES) $(TARGOPTS)
+endif
+
+PREINSTALL_FILES = \
+$(PROJECT_INCLUDE)/rtems/score \
+$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+
+$(PROJECT_INCLUDE)/rtems/score:
+ @$(mkinstalldirs) $@
-RTEMS_USE_NEWLIB = @RTEMS_USE_NEWLIB@
-HAS_ITRON_API = @HAS_ITRON_API@
+$(PROJECT_INCLUDE)/rtems/score/%.h: %.h
+ $(INSTALL_DATA) $< $@
#
# Add your list of files to delete here. The config files
@@ -47,8 +40,7 @@ HAS_ITRON_API = @HAS_ITRON_API@
# 'make clobber' already includes 'make clean'
#
-CLEAN_ADDITIONS += $(TARGOPTS)
-CLOBBER_ADDITIONS +=
+CLEANFILES += $(TARGOPTS)
# Until RTEMS_CPU is removed from all the make configuration files,
# this will need to be here to transform hppa1.1 into hppa1_1 to
@@ -104,12 +96,8 @@ $(TARGOPTS):
@echo >>$@
@echo "#endif" >>$@
-all: preinstall
+all: $(PREINSTALL_FILES)
-preinstall: $(INSTALLDIRS) $(H_FILES) $(TARGOPTS)
- @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems/score
- @$(INSTALL_CHANGE) -m 644 $(TARGOPTS) $(PROJECT_INCLUDE)/rtems/score
+EXTRA_DIST = $(STD_H_FILES) $(MP_H_FILES)
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/inline/rtems/score/Makefile.am b/c/src/exec/score/inline/rtems/score/Makefile.am
index 1db2dcec4d..e7dc3a2cde 100644
--- a/c/src/exec/score/inline/rtems/score/Makefile.am
+++ b/c/src/exec/score/inline/rtems/score/Makefile.am
@@ -4,22 +4,26 @@
AUTOMAKE_OPTIONS = foreign 1.4
-if INLINE
## We only build multiprocessing related files if HAS_MP was defined
-if HAS_MP
MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl
-endif
-I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl \
+STD_I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl \
heap.inl isr.inl object.inl priority.inl stack.inl states.inl \
sysstate.inl thread.inl tod.inl tqdata.inl userext.inl watchdog.inl \
- wkspace.inl $(MP_I_FILES)
+ wkspace.inl
-noinst_HEADERS = $(I_FILES)
+if HAS_MP
+I_FILES = $(STD_I_FILES) $(MP_I_FILES)
+else
+I_FILES = $(STD_I_FILES)
+endif
+
+noinst_HEADERS = $(STD_I_FILES) $(MP_I_FILES)
+if INLINE
PREINSTALL_FILES = \
$(PROJECT_INCLUDE)/rtems/score \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/score/%)
+$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
$(PROJECT_INCLUDE)/rtems/score:
@$(mkinstalldirs) $@
diff --git a/c/src/exec/score/macros/rtems/score/Makefile.am b/c/src/exec/score/macros/rtems/score/Makefile.am
index 05cc4ea5a1..0ac48e0386 100644
--- a/c/src/exec/score/macros/rtems/score/Makefile.am
+++ b/c/src/exec/score/macros/rtems/score/Makefile.am
@@ -4,24 +4,25 @@
AUTOMAKE_OPTIONS = foreign 1.4
-EXTRA_DIST = README
-
-if MACROS
-if HAS_MP
## We only build multiprocessing related files if HAS_MP was defined
MP_I_FILES = mppkt.inl objectmp.inl threadmp.inl
-endif
-I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl heap.inl \
+STD_I_FILES = address.inl chain.inl coremsg.inl coremutex.inl coresem.inl heap.inl \
isr.inl object.inl priority.inl stack.inl states.inl sysstate.inl \
- thread.inl tod.inl tqdata.inl userext.inl watchdog.inl wkspace.inl \
- $(MP_I_FILES)
+ thread.inl tod.inl tqdata.inl userext.inl watchdog.inl wkspace.inl
-noinst_HEADERS = $(I_FILES)
+noinst_HEADERS = $(STD_I_FILES) $(MP_I_FILES)
+
+if MACROS
+if HAS_MP
+I_FILES = $(STD_I_FILES) $(MP_I_FILES)
+else
+I_FILES = $(STD_I_FILES
+endif
PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
+$(PROJECT_INCLUDE)/rtems/score \
+$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/score%)
$(PROJECT_INCLUDE)/rtems/score:
@$(mkinstalldirs) $@
diff --git a/c/src/exec/score/src/Makefile.am b/c/src/exec/score/src/Makefile.am
new file mode 100644
index 0000000000..04947cec47
--- /dev/null
+++ b/c/src/exec/score/src/Makefile.am
@@ -0,0 +1,81 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+# We only build multiprocessing related files if HAS_MP was defined
+MP_C_FILES = mpci.c objectmp.c threadmp.c
+
+CORE_MESSAGE_QUEUE_C_FILES = coremsg.c coremsgbroadcast.c coremsgclose.c \
+ coremsgflush.c coremsgflushsupp.c coremsgseize.c coremsgsubmit.c
+
+CORE_MUTEX_C_FILES = coremutex.c coremutexflush.c coremutexseize.c \
+ coremutexsurrender.c
+
+CORE_SEMAPHORE_C_FILES = coresem.c coresemflush.c coresemseize.c \
+ coresemsurrender.c
+
+HEAP_C_FILES = heap.c heapallocate.c heapextend.c heapfree.c \
+ heapsizeofuserarea.c heapwalk.c
+
+OBJECT_C_FILES = object.c objectallocate.c objectallocatebyindex.c \
+ objectclearname.c objectcomparenameraw.c objectcomparenamestring.c \
+ objectcopynameraw.c objectcopynamestring.c objectextendinformation.c \
+ objectfree.c objectget.c objectgetbyindex.c objectgetnext.c \
+ objectinitializeinformation.c objectnametoid.c objectshrinkinformation.c
+
+THREAD_C_FILES = thread.c threadchangepriority.c threadclearstate.c \
+ threadclose.c threadcreateidle.c threaddelayended.c threaddispatch.c \
+ threadevaluatemode.c threadget.c threadhandler.c threadidlebody.c \
+ threadinitialize.c threadloadenv.c threadready.c threadresettimeslice.c \
+ threadreset.c threadrestart.c threadresume.c threadrotatequeue.c \
+ threadsetpriority.c threadsetstate.c threadsettransient.c \
+ threadstackallocate.c threadstackfree.c threadstart.c \
+ threadstartmultitasking.c threadsuspend.c threadtickletimeslice.c \
+ threadyieldprocessor.c
+
+THREADQ_C_FILES = threadq.c threadqdequeue.c threadqdequeuefifo.c \
+ threadqdequeuepriority.c threadqenqueue.c threadqenqueuefifo.c \
+ threadqenqueuepriority.c threadqextract.c threadqextractfifo.c \
+ threadqextractpriority.c threadqextractwithproxy.c threadqfirst.c \
+ threadqfirstfifo.c threadqfirstpriority.c threadqflush.c \
+ threadqtimeout.c
+
+TOD_C_FILES = coretod.c coretodset.c coretodtickle.c coretodtoseconds.c \
+ coretodvalidate.c
+
+WATCHDOG_C_FILES = watchdog.c watchdogadjust.c watchdoginsert.c \
+ watchdogremove.c watchdogtickle.c
+
+# C and C++ source names, if any, go here -- minus the .c or .cc
+STD_C_FILES = apiext.c chain.c $(CORE_MESSAGE_QUEUE_C_FILES) \
+ $(CORE_MUTEX_C_FILES) $(CORE_SEMAPHORE_C_FILES) $(HEAP_C_FILES) interr.c \
+ isr.c $(OBJECT_C_FILES) $(THREAD_C_FILES) $(THREADQ_C_FILES) \
+ $(TOD_C_FILES) userext.c $(WATCHDOG_C_FILES) wkspace.c
+
+if HAS_MP
+C_FILES = $(STD_C_FILES) $(MP_C_FILES)
+else
+C_FILES = $(STD_C_FILES)
+endif
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+#
+# Add local stuff here using +=
+#
+
+AM_CPPFLAGS += -D__RTEMS_INSIDE__
+AM_CFLAGS += $(CFLAGS_OS_V)
+
+all: ${ARCH} ${OBJS}
+
+EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES) Unlimited.txt
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/score/src/Makefile.in b/c/src/exec/score/src/Makefile.in
deleted file mode 100644
index f92f3c9577..0000000000
--- a/c/src/exec/score/src/Makefile.in
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = score/src
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-# We only build multiprocessing related files if HAS_MP was defined
-MP_C_PIECES_yes_V = mpci objectmp threadmp
-MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V)
-
-CORE_MESSAGE_QUEUE_C_PIECES= coremsg coremsgbroadcast coremsgclose \
- coremsgflush coremsgflushsupp coremsgseize coremsgsubmit
-
-CORE_MUTEX_C_PIECES= coremutex coremutexflush coremutexseize \
- coremutexsurrender
-
-CORE_SEMAPHORE_C_PIECES= coresem coresemflush coresemseize coresemsurrender
-
-HEAP_C_PIECES = heap heapallocate heapextend heapfree \
- heapsizeofuserarea heapwalk
-
-OBJECT_C_PIECES = object objectallocate objectallocatebyindex \
- objectclearname objectcomparenameraw objectcomparenamestring \
- objectcopynameraw objectcopynamestring objectextendinformation \
- objectfree objectget objectgetbyindex objectgetnext \
- objectinitializeinformation objectnametoid objectshrinkinformation
-
-THREAD_C_PIECES = thread threadchangepriority threadclearstate threadclose \
- threadcreateidle threaddelayended threaddispatch threadevaluatemode \
- threadget threadhandler threadidlebody threadinitialize threadloadenv \
- threadready threadresettimeslice threadreset threadrestart threadresume \
- threadrotatequeue threadsetpriority threadsetstate threadsettransient \
- threadstackallocate threadstackfree threadstart threadstartmultitasking \
- threadsuspend threadtickletimeslice threadyieldprocessor
-
-THREADQ_C_PIECES= threadq threadqdequeue threadqdequeuefifo \
- threadqdequeuepriority threadqenqueue threadqenqueuefifo \
- threadqenqueuepriority threadqextract threadqextractfifo \
- threadqextractpriority threadqextractwithproxy threadqfirst \
- threadqfirstfifo threadqfirstpriority threadqflush threadqtimeout
-
-TOD_C_PIECES= coretod coretodset coretodtickle coretodtoseconds \
- coretodvalidate
-
-WATCHDOG_C_PIECES= watchdog watchdogadjust watchdoginsert watchdogremove \
- watchdogtickle
-
-# C and C++ source names, if any, go here -- minus the .c or .cc
-C_PIECES = apiext chain $(CORE_MESSAGE_QUEUE_C_PIECES) $(CORE_MUTEX_C_PIECES) \
- $(CORE_SEMAPHORE_C_PIECES) $(HEAP_C_PIECES) interr isr \
- $(OBJECT_C_PIECES) $(THREAD_C_PIECES) $(THREADQ_C_PIECES) \
- $(TOD_C_PIECES) userext \
- $(WATCHDOG_C_PIECES) wkspace $(MP_C_PIECES)
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-SRCS = $(C_FILES)
-OBJS = $(C_O_FILES)
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES += -D__RTEMS_INSIDE__
-CPPFLAGS +=
-CFLAGS += $(CFLAGS_OS_V)
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} $(SRCS) ${OBJS}
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/wrapup/itron/Makefile.am b/c/src/exec/wrapup/itron/Makefile.am
new file mode 100644
index 0000000000..58ceeb6d05
--- /dev/null
+++ b/c/src/exec/wrapup/itron/Makefile.am
@@ -0,0 +1,36 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+if HAS_ITRON
+LIBNAME = libitron
+LIB = $(ARCH)/$(LIBNAME).a
+endif
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+if HAS_ITRON
+
+ITRON_OBJS = $(wildcard ../../itron/src/$(ARCH)/*.o)
+
+OBJS = $(ITRON_OBJS)
+
+$(LIB): ${OBJS}
+ $(make-library)
+
+ITRON_LIB = \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
+ $(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
+
+endif
+
+TMPINSTALL_FILES += $(ITRON_LIB)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/wrapup/itron/Makefile.in b/c/src/exec/wrapup/itron/Makefile.in
deleted file mode 100644
index eecd38fc21..0000000000
--- a/c/src/exec/wrapup/itron/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = wrapup/itron
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-ITRON_OBJS = $(wildcard ../../itron/src/$(ARCH)/*.o)
-
-OBJS = $(ITRON_OBJS)
-# HACK: AM_CONDITIONAL
-LIB = @HAS_ITRON_TRUE@$(ARCH)/libitron.a
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(LIB): ${OBJS}
- $(make-library)
-
-# HACK: AM_CONDITIONAL
-all: @HAS_ITRON_TRUE@${ARCH} $(SRCS) $(LIB)
-@HAS_ITRON_TRUE@ @$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/wrapup/posix/Makefile.am b/c/src/exec/wrapup/posix/Makefile.am
new file mode 100644
index 0000000000..d80634763d
--- /dev/null
+++ b/c/src/exec/wrapup/posix/Makefile.am
@@ -0,0 +1,36 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+if HAS_POSIX
+LIBNAME = libposix
+LIB = $(ARCH)/$(LIBNAME).a
+endif
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+if HAS_POSIX
+
+POSIX_OBJS = $(wildcard ../../posix/src/$(ARCH)/*.o)
+
+OBJS = $(POSIX_OBJS)
+
+$(LIB): ${OBJS}
+ $(make-library)
+
+POSIX_LIB = \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
+ $(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
+
+endif
+
+TMPINSTALL_FILES += $(POSIX_LIB)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/wrapup/posix/Makefile.in b/c/src/exec/wrapup/posix/Makefile.in
deleted file mode 100644
index 4ea34f75fb..0000000000
--- a/c/src/exec/wrapup/posix/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = wrapup/posix
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-POSIX_OBJS = $(wildcard ../../posix/src/$(ARCH)/*.o)
-
-OBJS = $(CPU_OBJS) $(CORE_OBJS) $(POSIX_OBJS) $(SAPI_OBJS)
-# HACK: AM_CONDITIONAL
-LIB = @HAS_POSIX_TRUE@$(ARCH)/libposix.a
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(LIB): ${OBJS}
- $(make-library)
-
-# HACK: AM_CONDITIONAL
-all: @HAS_POSIX_TRUE@${ARCH} $(SRCS) $(LIB)
-@HAS_POSIX_TRUE@ @$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/exec/wrapup/rtems/Makefile.am b/c/src/exec/wrapup/rtems/Makefile.am
new file mode 100644
index 0000000000..d2cadc9a58
--- /dev/null
+++ b/c/src/exec/wrapup/rtems/Makefile.am
@@ -0,0 +1,36 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = librtems
+LIB = $(ARCH)/$(LIBNAME).a
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+CPU_OBJS = $(wildcard ../../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel)
+CORE_OBJS = $(wildcard ../../score/src/$(ARCH)/*.o)
+SAPI_OBJS = $(wildcard ../../sapi/src/$(ARCH)/*.o)
+RTEMS_OBJS = $(wildcard ../../rtems/src/$(ARCH)/*.o)
+
+OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS)
+
+SIZE_RTEMS = $(SHELL) $(PROJECT_ROOT)/tools/cpu/generic/size_rtems
+
+$(LIB): ${OBJS}
+ $(make-library)
+ # cd $(PROJECT_ROOT) ; \
+ $(SIZE_RTEMS) @RTEMS_BSP@ $(ARCH) \
+ >$(PROJECT_RELEASE)/lib/sizeinfo$(LIB_VARIANT).txt
+
+TMPINSTALL_FILES += \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
+ $(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(TMPINSTALL_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/wrapup/rtems/Makefile.in b/c/src/exec/wrapup/rtems/Makefile.in
deleted file mode 100644
index 8995bf5e46..0000000000
--- a/c/src/exec/wrapup/rtems/Makefile.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = wrapup/rtems
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-CPU_OBJS = $(wildcard ../../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel)
-CORE_OBJS = $(wildcard ../../score/src/$(ARCH)/*.o)
-SAPI_OBJS = $(wildcard ../../sapi/src/$(ARCH)/*.o)
-RTEMS_OBJS = $(wildcard ../../rtems/src/$(ARCH)/*.o)
-
-OBJS = $(CPU_OBJS) $(CORE_OBJS) $(RTEMS_OBJS) $(SAPI_OBJS)
-LIB = $(ARCH)/librtems.a
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-SIZE_RTEMS = $(SHELL) $(PROJECT_ROOT)/tools/cpu/generic/size_rtems
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here. The config files
-# already know how to delete some stuff, so you may want
-# to just run 'make clean' first to see what gets missed.
-# 'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(LIB): ${OBJS}
- $(make-library)
- # cd $(PROJECT_ROOT) ; \
- $(SIZE_RTEMS) @RTEMS_BSP@ $(ARCH) \
- >$(PROJECT_RELEASE)/lib/sizeinfo$(LIB_VARIANT).txt
-
-all: ${ARCH} $(SRCS) $(LIB)
- $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/c/src/optman/rtems/Makefile.am b/c/src/optman/rtems/Makefile.am
new file mode 100644
index 0000000000..163bd86c97
--- /dev/null
+++ b/c/src/optman/rtems/Makefile.am
@@ -0,0 +1,40 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = no-dpmem.c no-event.c no-msg.c no-mp.c no-part.c no-region.c \
+ no-rtmon.c no-sem.c no-signal.c no-timer.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+TMPINSTALL_FILES = \
+$(PROJECT_RELEASE)/lib \
+$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
+
+$(PROJECT_RELEASE)/lib:
+ @$(mkinstalldirs) $@
+
+$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
+ $(INSTALL_DATA) $< $@
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+AM_CFLAGS += $(CFLAGS_OS_V)
+ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
+
+all: ${ARCH} $(TMPINSTALL_FILES)
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/optman/sapi/Makefile.am b/c/src/optman/sapi/Makefile.am
new file mode 100644
index 0000000000..34b23d5f6c
--- /dev/null
+++ b/c/src/optman/sapi/Makefile.am
@@ -0,0 +1,39 @@
+##
+## $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+C_FILES = no-ext.c no-io.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
+
+SRCS = $(C_FILES)
+OBJS = $(C_O_FILES)
+
+PGMNAME = $(C_FILES:%.c=%)
+PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+TMPINSTALL_FILES = \
+$(PROJECT_RELEASE)/lib \
+$(PGMNAME:%=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+AM_CFLAGS += $(CFLAGS_OS_V)
+ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems
+
+$(PROJECT_RELEASE)/lib:
+ $(mkinstalldirs) $@
+$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
+ $(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(TMPINSTALL_FILES)
+
+EXTRA_DIST = $(C_FILES)
+
+include $(top_srcdir)/../../../automake/local.am