From dc2ba1c07f586c8eb81439bf27c8d8bf071f11c0 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Mon, 13 Sep 1999 19:39:55 +0000 Subject: [PATCH] changes for 3.14 --- src/rsrv/Makefile | 13 +++++++++++-- src/rsrv/Makefile.Vx | 21 --------------------- src/rsrv/globalsource.c | 1 + 3 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 src/rsrv/Makefile.Vx diff --git a/src/rsrv/Makefile b/src/rsrv/Makefile index 8cca632b9..98960a8d5 100644 --- a/src/rsrv/Makefile +++ b/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 diff --git a/src/rsrv/Makefile.Vx b/src/rsrv/Makefile.Vx deleted file mode 100644 index 53fe28e00..000000000 --- a/src/rsrv/Makefile.Vx +++ /dev/null @@ -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) - diff --git a/src/rsrv/globalsource.c b/src/rsrv/globalsource.c index 4fdfcb1fa..94af84f9a 100644 --- a/src/rsrv/globalsource.c +++ b/src/rsrv/globalsource.c @@ -36,6 +36,7 @@ static char *sccsId = "@(#) $Id$"; #include #include #include +#include #include "ellLib.h" #include "db_access.h"