From fd41f95d84901f95877b9556a4d983ab0232ec4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Sandstr=C3=B6m?= Date: Thu, 2 May 2024 14:48:37 +0200 Subject: [PATCH] Update makefile --- GNUmakefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index b773253..5f56733 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -16,7 +16,7 @@ OPT_CXXFLAGS_YES = -O3 # dependencies ECmasterECMC_VERSION = v1.1.0 -motorECMC_VERSION = 7.0.7-ESS +#motorECMC_VERSION = 7.0.7-ESS ecmc_VERSION = 9.5.0 ################################################################################ @@ -29,10 +29,10 @@ EC_MASTER_LIB = ${EPICS_MODULES}/ECmasterECMC/${ECmasterECMC_VERSION}/R${EPICSVE USR_LDFLAGS += -Wl,-rpath=${EC_MASTER_LIB} USR_LDFLAGS += -L ${EC_MASTER_LIB} -BASE_DIR = ecmc_plugin_motion +BASE_DIR = . SRC_DIR = $(BASE_DIR)/src DB_DIR = $(BASE_DIR)/Db - +SCRIPTS_DIR = $(BASE_DIR)/scripts SOURCES += $(SRC_DIR)/ecmcPluginMotion.c SOURCES += $(SRC_DIR)/ecmcMotionPlgWrap.cpp SOURCES += $(SRC_DIR)/ecmcMotionPlg.cpp @@ -41,6 +41,5 @@ SOURCES += $(SRC_DIR)/ecmcMotionPlg.cpp HEADERS += $(foreach d,${SRC_DIR}, $(wildcard $d/*.h)) DBDS += $(foreach d,${SRC_DIR}, $(wildcard $d/*.dbd)) SCRIPTS += $(BASE_DIR)/startup.cmd -SCRIPTS += $(BASE_DIR)/addMotionObj.cmd +SCRIPTS += $(SCRIPTS_DIR)/addMotionObj.cmd TEMPLATES += $(wildcard $(DB_DIR)/*.template) -