From 546a48796ab61410e7b2d10d4399b9af7bd9396c Mon Sep 17 00:00:00 2001 From: Simon Rose <simon.rose@ess.eu> Date: Fri, 8 Jan 2021 10:36:17 +0100 Subject: [PATCH] Removed comments from CONFIG_E3_PATH --- configure/E3/CONFIG_E3_PATH | 12 ------------ configure/modules/CONFIG_E3_PATH | 29 ----------------------------- 2 files changed, 41 deletions(-) diff --git a/configure/E3/CONFIG_E3_PATH b/configure/E3/CONFIG_E3_PATH index c7872630..a3adee52 100644 --- a/configure/E3/CONFIG_E3_PATH +++ b/configure/E3/CONFIG_E3_PATH @@ -4,15 +4,3 @@ E3_SITEMODS_PATH:=$(E3_REQUIRE_LOCATION)/siteMods E3_SITELIBS_PATH:=$(E3_REQUIRE_LOCATION)/siteLibs E3_SITEAPPS_PATH:=$(E3_REQUIRE_LOCATION)/siteApps - - -INSTALLED_EPICS_BASE_ARCHS_PATHS=$(sort $(dir $(wildcard $(EPICS_BASE)/bin/*/))) -TEMP_INSTALLED_EPICS_BASE_ARCHS=$(INSTALLED_EPICS_BASE_ARCHS_PATHS:$(EPICS_BASE)/bin/%=%) -INSTALLED_EPICS_BASE_ARCHS=$(TEMP_INSTALLED_EPICS_BASE_ARCHS:/=) - - - -### Exclude the following variables to display -VARS_EXCLUDES+=TEMP_INSTALLED_EPICS_BASE_ARCHS -VARS_EXCLUDES+=INSTALLED_EPICS_BASE_ARCHS_PATHS - diff --git a/configure/modules/CONFIG_E3_PATH b/configure/modules/CONFIG_E3_PATH index 89bc3658..de9562e6 100644 --- a/configure/modules/CONFIG_E3_PATH +++ b/configure/modules/CONFIG_E3_PATH @@ -20,35 +20,6 @@ E3_MODULES_INSTALL_LOCATION_DB:=$(E3_MODULES_INSTALL_LOCATION)/db E3_MODULES_INSTALL_LOCATION_BIN:=$(E3_MODULES_INSTALL_LOCATION)/bin E3_MODULES_INSTALL_LOCATION_LIB:=$(E3_MODULES_INSTALL_LOCATION)/lib - -#E3_MODULES_INSTALL_LOCATION_INC_LINK:=$(E3_SITELIBS_PATH)/$(E3_MODULE_NAME)_$(E3_MODULE_VERSION)_include -#E3_MODULES_INSTALL_LOCATION_DB_LINK :=$(E3_SITELIBS_PATH)/$(E3_MODULE_NAME)_$(E3_MODULE_VERSION)_db -#E3_MODULES_INSTALL_LOCATION_BIN_LINK:=$(E3_SITELIBS_PATH)/$(E3_MODULE_NAME)_$(E3_MODULE_VERSION)_bin -#E3_MODULES_INSTALL_LOCATION_LIB_LINK:=$(E3_SITELIBS_PATH)/$(E3_MODULE_NAME)_$(E3_MODULE_VERSION)_lib - - -E3_MODULES_INSTALL_LOCATION_DBD:=$(E3_MODULES_INSTALL_LOCATION)/dbd/$(E3_MODULE_NAME).dbd -#E3_MODULES_INSTALL_LOCATION_DBD_LINK:=$(E3_SITELIBS_PATH)/$(E3_MODULE_NAME).dbd.$(E3_MODULE_VERSION) - EXPORT_VARS+=E3_MODULES_VENDOR_LIBS_LOCATION -#EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_INC -#EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_DB -#EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_BIN EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_LIB -#EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_LIB_LINK - -# It is a bit weird, it would be better to implement within driver.makefile later -# Assumption : we are using the same lib name from driver.makefile -E3_MODULES_LIBNAME:=lib$(E3_MODULE_NAME).so -E3_MODULES_LIBLINKNAME:=$(E3_MODULES_LIBNAME).$(E3_MODULE_VERSION) - -INSTALLED_EPICS_BASE_ARCHS_PATHS=$(sort $(dir $(wildcard $(EPICS_BASE)/bin/*/))) -TEMP_INSTALLED_EPICS_BASE_ARCHS=$(INSTALLED_EPICS_BASE_ARCHS_PATHS:$(EPICS_BASE)/bin/%=%) -INSTALLED_EPICS_BASE_ARCHS=$(TEMP_INSTALLED_EPICS_BASE_ARCHS:/=) - - - -### Exclude the following variables to display -VARS_EXCLUDES+=TEMP_INSTALLED_EPICS_BASE_ARCHS -VARS_EXCLUDES+=INSTALLED_EPICS_BASE_ARCHS_PATHS -- GitLab