From 139f398798eb55a7fedc2331cd06e9a753b8192e Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Thu, 29 Jun 2017 11:57:29 +0200 Subject: [PATCH] pcas: re-add building of ex (caServerApp template) for verification --- src/pcas/Makefile | 4 ++-- src/pcas/example/Makefile | 4 ++-- src/pcas/example/README | 7 ++++--- src/pcas/{ => example}/ex/Makefile | 11 ++++------- 4 files changed, 12 insertions(+), 14 deletions(-) rename src/pcas/{ => example}/ex/Makefile (82%) diff --git a/src/pcas/Makefile b/src/pcas/Makefile index e6fd6ea91..bac9a0b17 100644 --- a/src/pcas/Makefile +++ b/src/pcas/Makefile @@ -4,14 +4,14 @@ # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. # EPICS BASE is 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=../.. include $(TOP)/configure/CONFIG -DIRS = build example +DIRS = build example example_DEPEND_DIRS = build diff --git a/src/pcas/example/Makefile b/src/pcas/example/Makefile index 8f4cc5100..e409716c2 100644 --- a/src/pcas/example/Makefile +++ b/src/pcas/example/Makefile @@ -5,14 +5,14 @@ # 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=../../.. include $(TOP)/configure/CONFIG -DIRS = directoryService +DIRS = directoryService ex include $(TOP)/configure/RULES_DIRS diff --git a/src/pcas/example/README b/src/pcas/example/README index affe6533d..9a966b340 100644 --- a/src/pcas/example/README +++ b/src/pcas/example/README @@ -1,7 +1,8 @@ This directory contains a server tool example (which uses the -ca server library): +PCAS server library): directoryService - fully functional pv name resolution server -The simple example that was provided here has been become the -makeBaseApp template "caServerApp" +The simple example that was provided here has become the +makeBaseApp template "caServerApp". It is still being built +in the ex directory as a verification of the template. diff --git a/src/pcas/ex/Makefile b/src/pcas/example/ex/Makefile similarity index 82% rename from src/pcas/ex/Makefile rename to src/pcas/example/ex/Makefile index 061fb5d7e..30014ccce 100644 --- a/src/pcas/ex/Makefile +++ b/src/pcas/example/ex/Makefile @@ -4,23 +4,22 @@ # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. # EPICS BASE is 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 -PROD_LIBS += $(EPICS_BASE_HOST_LIBS) +PROD_LIBS += $(EPICS_BASE_HOST_LIBS) cas gdd -SRC_DIRS += $(TOP)/src/template/base/top/caServerApp +SRC_DIRS += $(TOP)/src/template/top/caServerApp # # Added ws2_32 winmm user32 for the non-dll build # PROD_SYS_LIBS_WIN32 += ws2_32 advapi32 user32 - PROD_HOST = excas excas_SRCS += main.cc @@ -32,5 +31,3 @@ excas_SRCS += exAsyncPV.cc excas_SRCS += exChannel.cc include $(TOP)/configure/RULES - -