From b2f7f4e173c7d4206744a5ad1bd2620e06808a76 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 11 Mar 2021 18:13:44 -0600 Subject: [PATCH] Minor fixes in configure/RULES files --- configure/RULES.Db | 2 +- configure/RULES_BUILD | 5 +++-- configure/RULES_TARGET | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure/RULES.Db b/configure/RULES.Db index 8c5d99ed7..61b548386 100644 --- a/configure/RULES.Db +++ b/configure/RULES.Db @@ -159,7 +159,7 @@ cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch)) -include $(TOP)/configure/CONFIG_APP_INCLUDE all: install -ifeq ($(EPICS_HOST_ARCH),$T_A) +ifeq ($(EPICS_HOST_ARCH),$(T_A)) host: install else # Do nothing diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 3dcbcaa74..13428d846 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -86,9 +86,10 @@ endif #--------------------------------------------------------------- # Include defines and rules for prod, library and test* targets -#ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) )) +ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) \ + $(LOADABLE_LIBRARY))) include $(CONFIG)/RULES_TARGET -#endif +endif #--------------------------------------------------------------- # Read dependency files diff --git a/configure/RULES_TARGET b/configure/RULES_TARGET index 4e9cb6e05..ece7e10bc 100644 --- a/configure/RULES_TARGET +++ b/configure/RULES_TARGET @@ -26,7 +26,6 @@ $(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRA #----------------------------------------------------------------------- -# This define block requires GNU make 3.81 define PROD_template ifeq ($$(strip $$($(1)_OBJS) $$($(1)_SRCS) $$(PRODUCT_OBJS)),) $(1)_OBJS = $(1)$$(OBJ)