From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 c/src/optman/rtems/Makefile.am | 3 +--
 c/src/optman/rtems/no-mp.c     | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'c/src/optman/rtems')

diff --git a/c/src/optman/rtems/Makefile.am b/c/src/optman/rtems/Makefile.am
index 943e9cb210..dc6c6292b7 100644
--- a/c/src/optman/rtems/Makefile.am
+++ b/c/src/optman/rtems/Makefile.am
@@ -14,7 +14,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/lib.am
 
 TMPINSTALL_FILES += \
-$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
+    $(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
 
 $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
 	$(INSTALL_DATA) $< $@
@@ -23,7 +23,6 @@ $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS += $(CFLAGS_OS_V)
 ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
 
 all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
diff --git a/c/src/optman/rtems/no-mp.c b/c/src/optman/rtems/no-mp.c
index 5fc8f81df6..6c23d4e923 100644
--- a/c/src/optman/rtems/no-mp.c
+++ b/c/src/optman/rtems/no-mp.c
@@ -156,6 +156,7 @@ Thread _MPCI_Receive_server(
     FALSE,
     RTEMS_NOT_CONFIGURED
   );
+  return NULL;
 }
 
 void _MPCI_Announce ( void )
-- 
cgit v1.2.3