From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- cpukit/itron/include/Makefile.am | 9 +++------ cpukit/itron/src/Makefile.am | 25 ++++++++----------------- cpukit/itron/src/cre_tsk.c | 3 +-- cpukit/itron/src/eventflags.c | 2 +- cpukit/itron/src/fmempool.c | 2 +- cpukit/itron/src/itronsem.c | 2 +- cpukit/itron/src/mbox.c | 2 +- cpukit/itron/src/msgbuffer.c | 2 +- cpukit/itron/src/port.c | 2 +- cpukit/itron/src/vmempool.c | 2 +- 10 files changed, 19 insertions(+), 32 deletions(-) (limited to 'cpukit/itron') diff --git a/cpukit/itron/include/Makefile.am b/cpukit/itron/include/Makefile.am index a12590301a..66bdf8c9e7 100644 --- a/cpukit/itron/include/Makefile.am +++ b/cpukit/itron/include/Makefile.am @@ -8,18 +8,15 @@ H_FILES = itron.h noinst_HEADERS = $(H_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE) \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) $(PROJECT_INCLUDE): @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) +all-local: $(PREINSTALL_FILES) SUBDIRS = rtems itronsys diff --git a/cpukit/itron/src/Makefile.am b/cpukit/itron/src/Makefile.am index f508440f60..92ae498c69 100644 --- a/cpukit/itron/src/Makefile.am +++ b/cpukit/itron/src/Makefile.am @@ -18,9 +18,9 @@ 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 +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 @@ -49,20 +49,11 @@ 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 + +all-local: ${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) diff --git a/cpukit/itron/src/cre_tsk.c b/cpukit/itron/src/cre_tsk.c index 665e158652..250293c026 100644 --- a/cpukit/itron/src/cre_tsk.c +++ b/cpukit/itron/src/cre_tsk.c @@ -30,7 +30,6 @@ ER cre_tsk( ) { register Thread_Control *the_thread; - char *name = "trn"; boolean status; Priority_Control core_priority; @@ -90,7 +89,7 @@ ER cre_tsk( THREAD_CPU_BUDGET_ALGORITHM_EXHAUST_TIMESLICE, NULL, /* no budget algorithm callout */ 0, - &name + NULL ); if ( !status ) { diff --git a/cpukit/itron/src/eventflags.c b/cpukit/itron/src/eventflags.c index b7d974ae37..f1a0858e92 100644 --- a/cpukit/itron/src/eventflags.c +++ b/cpukit/itron/src/eventflags.c @@ -38,7 +38,7 @@ void _ITRON_Eventflags_Manager_initialization( /* control block */ FALSE, /* TRUE if names for this object */ /* are strings */ - RTEMS_MAXIMUM_NAME_LENGTH, /* maximum length of each object's */ + ITRON_MAXIMUM_NAME_LENGTH, /* maximum length of each object's */ /* name */ FALSE /* TRUE if this class is threads */ ); diff --git a/cpukit/itron/src/fmempool.c b/cpukit/itron/src/fmempool.c index ec19e6770c..93bbe56af1 100644 --- a/cpukit/itron/src/fmempool.c +++ b/cpukit/itron/src/fmempool.c @@ -39,7 +39,7 @@ void _ITRON_Fixed_memory_pool_Manager_initialization( /* size of this object's control block */ FALSE, /* TRUE if names for this object */ /* are strings */ - RTEMS_MAXIMUM_NAME_LENGTH, /* maximum length of each object's */ + ITRON_MAXIMUM_NAME_LENGTH, /* maximum length of each object's */ /* name */ FALSE /* TRUE if this class is threads */ ); diff --git a/cpukit/itron/src/itronsem.c b/cpukit/itron/src/itronsem.c index ad9278aec2..83686b4a44 100644 --- a/cpukit/itron/src/itronsem.c +++ b/cpukit/itron/src/itronsem.c @@ -41,7 +41,7 @@ void _ITRON_Semaphore_Manager_initialization( sizeof( ITRON_Semaphore_Control ), /* size of this object's control block */ FALSE, /* TRUE if names for this object */ /* are strings */ - RTEMS_MAXIMUM_NAME_LENGTH, /* maximum length of each object's */ + ITRON_MAXIMUM_NAME_LENGTH, /* maximum length of each object's */ /* name */ FALSE /* TRUE if this class is threads */ ); diff --git a/cpukit/itron/src/mbox.c b/cpukit/itron/src/mbox.c index a8dd9a26ca..6d2deb8819 100644 --- a/cpukit/itron/src/mbox.c +++ b/cpukit/itron/src/mbox.c @@ -40,7 +40,7 @@ void _ITRON_Mailbox_Manager_initialization( sizeof( ITRON_Mailbox_Control ), /* size of this object's control block */ FALSE, /* TRUE if names for this object */ /* are strings */ - RTEMS_MAXIMUM_NAME_LENGTH, /* maximum length of each object's */ + ITRON_MAXIMUM_NAME_LENGTH, /* maximum length of each object's */ /* name */ FALSE /* TRUE if this class is threads */ ); diff --git a/cpukit/itron/src/msgbuffer.c b/cpukit/itron/src/msgbuffer.c index 13c89efba6..e4cb4a4f20 100644 --- a/cpukit/itron/src/msgbuffer.c +++ b/cpukit/itron/src/msgbuffer.c @@ -43,7 +43,7 @@ void _ITRON_Message_buffer_Manager_initialization( block */ FALSE, /* TRUE if names for this object are strings */ - RTEMS_MAXIMUM_NAME_LENGTH, /* maximum length of each + ITRON_MAXIMUM_NAME_LENGTH, /* maximum length of each object's name */ FALSE /* TRUE if this class is threads */ ); diff --git a/cpukit/itron/src/port.c b/cpukit/itron/src/port.c index 0e9d98eb04..df360e155d 100644 --- a/cpukit/itron/src/port.c +++ b/cpukit/itron/src/port.c @@ -36,7 +36,7 @@ void _ITRON_Port_Manager_initialization( sizeof( ITRON_Port_Control ), /* size of this object's control block */ FALSE, /* TRUE if names for this object */ /* are strings */ - RTEMS_MAXIMUM_NAME_LENGTH, /* maximum length of each object's name */ + ITRON_MAXIMUM_NAME_LENGTH, /* maximum length of each object's name */ FALSE /* TRUE if this class is threads */ ); diff --git a/cpukit/itron/src/vmempool.c b/cpukit/itron/src/vmempool.c index d1a7d8a4a7..7f0ee73021 100644 --- a/cpukit/itron/src/vmempool.c +++ b/cpukit/itron/src/vmempool.c @@ -39,7 +39,7 @@ void _ITRON_Variable_memory_pool_Manager_initialization( /* size of this object's control block */ FALSE, /* TRUE if names for this object */ /* are strings */ - RTEMS_MAXIMUM_NAME_LENGTH, /* maximum length of each object's */ + ITRON_MAXIMUM_NAME_LENGTH, /* maximum length of each object's */ /* name */ FALSE /* TRUE if this class is threads */ ); -- cgit v1.2.3