Applied patch to update Makefiles, RELEASE and CONFIG_SITE files

This commit is contained in:
kpetersn
2019-04-09 11:26:32 -05:00
parent 2846bfa018
commit 57b6582e69
11 changed files with 96 additions and 87 deletions

View File

@@ -0,0 +1,7 @@
# Use settings from motor's CONFIG_SITE unless they are overridden below
-include $(MOTOR)/configure/CONFIG_SITE
#
CHECK_RELEASE = WARN
#
#BUILD_IOCS = YES

View File

@@ -0,0 +1,4 @@
MOTOR=
-include $(MOTOR)/configure/RELEASE
# path to motorAcs is needed to build the IOC inside motorAcs, but outside motor
MOTOR_ACS=

View File

@@ -2,7 +2,11 @@ TOP=..
include $(TOP)/configure/CONFIG
ifeq ($(INSTALL_CONFIG),$(MOTOR)/configure)
# Don't overwrite Motor's configure files
INSTALL_CONFIG =
endif
TARGETS = $(CONFIG_TARGETS)
CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
include $(TOP)/configure/RULES

View File

@@ -1,43 +1,7 @@
# RELEASE - Location of external support modules
#
# IF YOU MAKE ANY CHANGES to this file you must subsequently
# do a "gnumake rebuild" in this application's top level
# directory.
#
# The build process does not check dependencies against files
# that are outside this application, thus you should do a
# "gnumake rebuild" in the top level directory after EPICS_BASE
# or any other external module pointed to below is rebuilt.
#
# Host- or target-specific settings can be given in files named
# RELEASE.$(EPICS_HOST_ARCH).Common
# RELEASE.Common.$(T_A)
# RELEASE.$(EPICS_HOST_ARCH).$(T_A)
#
# This file is parsed by both GNUmake and an EPICS Perl script,
# so it can ONLY contain definititions of paths to other support
# modules, variable definitions that are used in module paths,
# and include statements that pull in other RELEASE files.
# Variables may be used before their values have been set.
# Build variables that are NOT used in paths should be set in
# the CONFIG_SITE file.
# Variables and paths to dependent modules:
#MODULES = /path/to/modules
#MYMODULE = $(MODULES)/my-module
# If using the sequencer, point SNCSEQ at its top directory:
#SNCSEQ = $(MODULES)/seq-ver
# EPICS_BASE should appear last so earlier modules can override stuff:
EPICS_BASE = /APSshare/epics/base-3.15.6
# Set RULES here if you want to use build rules from somewhere
# other than EPICS_BASE:
#RULES = $(MODULES)/build-rules
# These allow developers to override the RELEASE variable settings
# without having to modify the configure/RELEASE file itself.
-include $(TOP)/../RELEASE.local
# Use motor/module's generated release file when buidling inside motor
-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
# Use motorAcs's RELEASE.local when building outside motor
-include $(TOP)/configure/RELEASE.local