changes for 3.14

src/rsrv/Makefile

@@ -1,7 +1,16 @@
 
 TOP=../..
 
-include $(TOP)/config/CONFIG_BASE
+include $(TOP)/configure/CONFIG
 
-include $(TOP)/config/RULES_ARCHS
+USR_INCLUDES = -I../../ca
+USR_CFLAGS = -UUNIX
+
+rsrvLib_SRCS = \
+	caserverio.c caservertask.c camsgtask.c camessage.c \
+	rsrv_init.c cast_server.c online_notify.c globalsource.c 
+
+IOC_LIBRARY_vxWorks = rsrvLib
+
+include $(TOP)/configure/RULES_BUILD
 

src/rsrv/Makefile.Vx

@@ -1,21 +0,0 @@
-TOP = ../../..
-include $(TOP)/config/CONFIG_BASE
-
-USR_INCLUDES = -I../../ca
-USR_CFLAGS = -UUNIX
-
-SRCS.c =  ../caserverio.c ../caservertask.c ../camsgtask.c ../camessage.c \
-	../rsrv_init.c ../cast_server.c ../online_notify.c ../globalsource.c 
-
-OBJS = \
-	caserverio.o caservertask.o camsgtask.o camessage.o \
-	rsrv_init.o cast_server.o online_notify.o globalsource.o 
-
-PROD = rsrvLib
-
-include $(TOP)/config/RULES.Vx
-
-rsrvLib: $(OBJS)
-	$(RM) $@
-	$(LINK.c) $@ $(OBJS) $(LDLIBS)
-

src/rsrv/globalsource.c

@@ -36,6 +36,7 @@ static char *sccsId = "@(#) $Id$";
 #include <types.h>
 #include <socket.h>
 #include <in.h>
+#include <semLib.h>
 
 #include "ellLib.h"
 #include "db_access.h"