From 132189a5eb199b1abd5f4bd97312bba3661f9f10 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 17 Jul 2017 14:33:21 +0200 Subject: [PATCH] more makefile --- Makefile | 7 +++++-- src/Makefile | 1 - src/ca/Makefile | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 52eebb8..71c65d9 100644 --- a/Makefile +++ b/Makefile @@ -8,16 +8,19 @@ DIRS := configure DIRS += src src_DEPEND_DIRS = configure +DIRS += src/ca +src/ca_DEPEND_DIRS = src + DIRS += src/ioc src/ioc_DEPEND_DIRS = src DIRS += pvtoolsSrc -pvtoolsSrc_DEPEND_DIRS = src +pvtoolsSrc_DEPEND_DIRS = src src/ca DIRS += testApp testApp_DEPEND_DIRS = src DIRS += examples -examples_DEPEND_DIRS += src +examples_DEPEND_DIRS += src src/ca include $(TOP)/configure/RULES_TOP diff --git a/src/Makefile b/src/Makefile index bc9ae81..93b2604 100644 --- a/src/Makefile +++ b/src/Makefile @@ -22,7 +22,6 @@ include $(PVACCESS_SRC)/server/Makefile include $(PVACCESS_SRC)/rpcService/Makefile include $(PVACCESS_SRC)/rpcClient/Makefile include $(PVACCESS_SRC)/pipelineService/Makefile -include $(PVACCESS_SRC)/ca/Makefile include $(PVACCESS_SRC)/mb/Makefile LIBRARY += pvAccess diff --git a/src/ca/Makefile b/src/ca/Makefile index 9cd508a..99cd73a 100644 --- a/src/ca/Makefile +++ b/src/ca/Makefile @@ -1,6 +1,5 @@ -# This is a Makefile fragment, see ../Makefile - -SRC_DIRS += $(PVACCESS_SRC)/ca +TOP = ../.. +include $(TOP)/configure/CONFIG LIBRARY += pvAccessCA pvAccessCA_LIBS += ca pvAccess pvData Com @@ -12,3 +11,5 @@ INC += pv/caStatus.h pvAccessCA_SRCS += caProvider.cpp pvAccessCA_SRCS += caChannel.cpp pvAccessCA_SRCS += caStatus.cpp + +include $(TOP)/configure/RULES