epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Cosmetic changes to template configure/CONFIG files

Browse Source
This commit is contained in:
Andrew Johnson
2021-05-17 12:16:55 -05:00
parent cc3e1039ce
commit 1db35d9edc
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/template/base/top/configure/CONFIG
View File

@@ -8,9 +8,10 @@ RULES = $(EPICS_BASE)
# RELEASE files point to other application tops
include $(TOP)/configure/RELEASE
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
ifdef T_A
-include $(TOP)/configure/RELEASE.Common.$(T_A)
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-include $(TOP)/configure/RELEASE.Common.$(T_A)
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
endif
# Check EPICS_BASE is set properly
@@ -28,11 +29,17 @@ include $(CONFIG)/CONFIG
# Override the Base definition:
INSTALL_LOCATION = $(TOP)
# CONFIG_SITE files contain other build configuration settings
# CONFIG_SITE files contain local build configuration settings
include $(TOP)/configure/CONFIG_SITE
# Host-arch specific settings
-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
ifdef T_A
# Target-arch specific settings
-include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
# Host & target specific settings
-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
endif

34
src/template/ext/top/configure/CONFIG
View File

@@ -1,13 +1,11 @@
# CONFIG - Load build configuration data
#
# Do not make changes in this file, any site-specific
# overrides should be given in a CONFIG_SITE file.
# Do not make changes to this file!
# Where the build rules come from
# Allow user to override where the build rules come from
RULES = $(EPICS_BASE)
INSTALL_IDLFILE = $(INSTALL)
# RELEASE files point to other application tops
include $(TOP)/configure/RELEASE
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
@@ -29,24 +27,26 @@ endif
CONFIG = $(RULES)/configure
include $(CONFIG)/CONFIG
# Override some Base definitions
# Override the Base definition:
INSTALL_LOCATION = $(TOP)
# CONFIG_SITE files contain build configuration overrides
# CONFIG_SITE files contain local build configuration settings
include $(TOP)/configure/CONFIG_SITE
# Host-arch specific settings
# Host-arch specific settings for extensions are in configure/os
-include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
ifdef T_A
# Target-arch specific settings for extensions are in configure/os
-include $(TOP)/configure/os/CONFIG_SITE.Common.$(T_A)
# Host & target specific settings for extensions are in configure/os
-include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
endif
# Additional settings for extensions
INSTALL_IDLFILE = $(INSTALL)
ifdef INSTALL_LOCATION_EXTENSIONS
INSTALL_LOCATION = $(INSTALL_LOCATION_EXTENSIONS)
endif
ifdef T_A
# Target-arch specific settings
-include $(TOP)/configure/os/CONFIG_SITE.Common.$(T_A)
# Host & target specific combination settings
-include $(TOP)/configure/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
endif