Adapt Makefiles to new layout

This commit is contained in:
Ralph Lange
2017-06-20 10:54:22 +02:00
parent cf365d079d
commit 44d3f874de
5 changed files with 10 additions and 13 deletions

View File

@@ -7,7 +7,7 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../../../..
TOP=../..
include $(TOP)/configure/CONFIG

View File

@@ -7,7 +7,7 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../../../..
TOP=../..
include $(TOP)/configure/CONFIG

View File

@@ -5,12 +5,11 @@
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP := ../../../../..
CAS := $(TOP)/src/ca/legacy/pcas
TOP := ../../..
CAS := $(TOP)/src/pcas
SRC := $(CAS)/generic
CA := $(TOP)/src/ca/client
IOSRC := $(CAS)/io/bsdSocket
STSRC := $(SRC)/st
@@ -19,7 +18,6 @@ include $(TOP)/configure/CONFIG
SRC_DIRS += $(SRC)
SRC_DIRS += $(IOSRC)
SRC_DIRS += $(STSRC)
SRC_DIRS += $(CA)
#USR_CXXFLAGS = $(USR_CFLAGS)
@@ -50,7 +48,7 @@ LIBSRCS += casMonitor.cc
LIBSRCS += casMonEvent.cc
LIBSRCS += inBuf.cc
LIBSRCS += outBuf.cc
LIBSRCS += casCtx.cc
LIBSRCS += casCtx.cc
LIBSRCS += casEventMask.cc
LIBSRCS += ioBlocked.cc
LIBSRCS += pvExistReturn.cc

View File

@@ -8,7 +8,7 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../../../../..
TOP=../../..
include $(TOP)/configure/CONFIG

View File

@@ -5,10 +5,10 @@
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../../../../../..
TOP=../../../..
include $(TOP)/configure/CONFIG
@@ -28,10 +28,9 @@ caDirServ_SRCS += directoryServer.cc
PROD_HOST = caDirServ
CLEANS += caDirServ pcaDirServ Templates.DB core
CLEANS += caDirServ pcaDirServ Templates.DB core
include $(TOP)/configure/RULES
pcaDirServ: $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
$(PURIFY_$(OS_CLASS)) $(LINK.cpp)