epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fixed build

Browse Source
This commit is contained in:
Jeff Hill
1996-06-26 21:35:40 +00:00
parent 31fd02f8e9
commit 5f1ec28daf
5 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cas/Makefile
View File

@@ -5,6 +5,9 @@
# by Janet Anderson
#
# $Log$
# Revision 1.2 1996/06/25 21:47:56 jba
# Makefile includes now from base/src/config, removed all soft links
#
# Revision 1.1.1.1 1996/06/20 00:28:05 jhill
# ca server installation
#
@@ -17,7 +20,8 @@ TOP=../..
include $(TOP)/src/config/CONFIG_BASE
DIRS = build example
DIRS = generic build example
include $(TOP)/src/config/RULES_DIRS
include $(TOP)/src/config/RULES_ARCHS

7
src/cas/build/Makefile
View File

@@ -5,6 +5,9 @@
# by Janet Anderson
#
# $Log$
# Revision 1.2 1996/06/25 21:47:58 jba
# Makefile includes now from base/src/config, removed all soft links
#
# Revision 1.1.1.1 1996/06/20 00:28:16 jhill
# ca server installation
#
@@ -17,8 +20,8 @@ TOP=../../..
include $(TOP)/src/config/CONFIG_BASE
DIRS = posix-sockets
DIRS = singleThread
include $(TOP)/src/config/RULES_ARCHS
include $(TOP)/src/config/RULES_DIRS

5
src/cas/build/singleThread/Makefile
View File

@@ -5,6 +5,9 @@
# by Janet Anderson
#
# $Log$
# Revision 1.2 1996/06/25 21:48:01 jba
# Makefile includes now from base/src/config, removed all soft links
#
# Revision 1.1.1.1 1996/06/20 00:28:17 jhill
# ca server installation
#
@@ -13,7 +16,7 @@
#
#
TOP= ../../../../
TOP= ../../../..
include $(TOP)/src/config/CONFIG_BASE

14
src/cas/build/singleThread/Makefile.Unix
View File

@@ -1,16 +1,16 @@
TOP = ../../../../..
CAS = ../../..
TOP = $(CAS)/../..
SRC = $(CAS)/generic
IOSRC = $(CAS)/io/bsdSocket
OSSRC = $(CAS)/os/posix
VPATH = $(SRC) $(IOSRC) $(OSSRC)
include Target.include
include $(TOP)/src/config/CONFIG_BASE
USR_INCLUDES = -I$(SRC) -I$(CAS)/../ca -I$(OSSRC) -I$(IOSRC) -I$(CAS)/gdd
USR_LDLIBS = -lcas -lm
USR_INCLUDES = -I$(SRC) -I$(CAS)/../ca -I$(OSSRC) -I$(IOSRC) -I$(CAS)/../gdd -I$(CAS)/../gdd/O.$(T_A)
USR_LDLIBS =
USR_LDFLAGS =
USR_CCFLAGS =
@@ -38,14 +38,11 @@ SRCS.cc += $(SRC)/casMonitor.cc
SRCS.cc += $(SRC)/casMonEvent.cc
SRCS.cc += $(SRC)/outBuf.cc
SRCS.cc += $(SRC)/inBuf.cc
SRCS.cc += $(SRC)/osiTimerQueue.cc
SRCS.cc += $(SRC)/osiTimer.cc
SRCS.cc += $(SRC)/casEventMask.cc
SRCS.cc += $(OSSRC)/caServerOS.cc
SRCS.cc += $(OSSRC)/casDGOS.cc
SRCS.cc += $(OSSRC)/casStreamOS.cc
SRCS.cc += $(OSSRC)/osiTimeOSD.cc
SRCS.cc += $(IOSRC)/caServerIO.cc
SRCS.cc += $(IOSRC)/casDGIO.cc
@@ -72,14 +69,11 @@ LIBOBJS += casMonitor.o
LIBOBJS += casMonEvent.o
LIBOBJS += outBuf.o
LIBOBJS += inBuf.o
LIBOBJS += osiTimerQueue.o
LIBOBJS += osiTimer.o
LIBOBJS += casEventMask.o
LIBOBJS += caServerOS.o
LIBOBJS += casDGOS.o
LIBOBJS += casStreamOS.o
LIBOBJS += osiTimeOSD.o
LIBOBJS += caServerIO.o
LIBOBJS += casDGIO.o

25
src/cas/os/posix/osiTimeOSD.cc
View File

@@ -1,25 +0,0 @@
#include <osiTime.h>
#include <sys/types.h>
#include <sys/time.h>
extern "C" {
int gettimeofday (struct timeval *tp, struct timezone *tzp);
}
//
// osiTime::getCurrent ()
//
osiTime osiTime::getCurrent ()
{
int status;
struct timeval tv;
struct timezone tzp;
status = gettimeofday (&tv, &tzp);
assert (status==0);
return osiTime(tv.tv_sec, tv.tv_usec * nSecPerUSec);
}