From ddeb0a827cdf1f90a5c4b1d84afd740df975f745 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 6 Jul 2016 17:05:04 -0500 Subject: [PATCH] Make EXPAND rule work on all arch's Fixes build for linux-arm in src/util. Don't expand files unless specifically requested. Expanded files are always precious. --- configure/RULES_EXPAND | 6 +----- src/util/Makefile | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/configure/RULES_EXPAND b/configure/RULES_EXPAND index 7bc4c863d..cf313bbb0 100644 --- a/configure/RULES_EXPAND +++ b/configure/RULES_EXPAND @@ -1,7 +1,5 @@ # /configure/RULES_EXPAND -ifeq ($(findstring Host,$(VALID_BUILDS)),Host) - # Default settings EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl @@ -10,8 +8,6 @@ EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS)) EXPANDED = $(EXPAND:%@=%) -buildInstall: $(EXPANDED) - $(EXPANDED): %: ../%@ $(ECHO) "Expanding $< to $@" @$(RM) $@ @@ -20,4 +16,4 @@ $(EXPANDED): %: ../%@ clean:: @$(RM) $(EXPANDED) -endif +.PRECIOUS: $(EXPANDED) diff --git a/src/util/Makefile b/src/util/Makefile index 20f60572e..525d6a2cf 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -1,10 +1,10 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2016 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. # EPICS BASE is distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. +# in file LICENSE that is included with this distribution. #************************************************************************* TOP=../.. @@ -33,5 +33,3 @@ EXPAND += caRepeater.service@ EXPAND_VARS = INSTALL_BIN=$(abspath $(INSTALL_BIN)) include $(TOP)/configure/RULES - -.PRECIOUS: $(EXPANDED)