From 5f1ec28daf4163484e7d1cdcd90e60a2cb32cc40 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 26 Jun 1996 21:35:40 +0000
Subject: [PATCH] fixed build

---
 src/cas/Makefile                         |  8 ++++++--
 src/cas/build/Makefile                   |  7 +++++--
 src/cas/build/singleThread/Makefile      |  5 ++++-
 src/cas/build/singleThread/Makefile.Unix | 14 ++++---------
 src/cas/os/posix/osiTimeOSD.cc           | 25 ------------------------
 5 files changed, 19 insertions(+), 40 deletions(-)
 delete mode 100644 src/cas/os/posix/osiTimeOSD.cc

diff --git a/src/cas/Makefile b/src/cas/Makefile
index a8d9d5639..c943860ed 100644
--- a/src/cas/Makefile
+++ b/src/cas/Makefile
@@ -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
 
diff --git a/src/cas/build/Makefile b/src/cas/build/Makefile
index 72a8f2ef7..5f5fa5cb9 100644
--- a/src/cas/build/Makefile
+++ b/src/cas/build/Makefile
@@ -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
 
 
diff --git a/src/cas/build/singleThread/Makefile b/src/cas/build/singleThread/Makefile
index c479ab6b8..f6d08e8c9 100644
--- a/src/cas/build/singleThread/Makefile
+++ b/src/cas/build/singleThread/Makefile
@@ -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
 
diff --git a/src/cas/build/singleThread/Makefile.Unix b/src/cas/build/singleThread/Makefile.Unix
index f6e3dc2ba..727d6602f 100644
--- a/src/cas/build/singleThread/Makefile.Unix
+++ b/src/cas/build/singleThread/Makefile.Unix
@@ -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
diff --git a/src/cas/os/posix/osiTimeOSD.cc b/src/cas/os/posix/osiTimeOSD.cc
deleted file mode 100644
index 28016a0d9..000000000
--- a/src/cas/os/posix/osiTimeOSD.cc
+++ /dev/null
@@ -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);
-}
-