From 4f2c38bb03102812571745e5c3ea7d7b18e89b79 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 20 Sep 2001 20:09:14 +0000 Subject: [PATCH] Changed how we decide whether or not to build cdCommands. --- configure/RULES.ioc | 14 ++++---------- .../top/exampleBoot/ioc/Makefile@vxWorks | 5 +---- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/configure/RULES.ioc b/configure/RULES.ioc index c6c89428f..03cb87550 100644 --- a/configure/RULES.ioc +++ b/configure/RULES.ioc @@ -1,19 +1,12 @@ #RULES.ioc include $(EPICS_BASE)/configure/RULES_DIRS -all: install - -buildInstall : build - +build: buildInstall install: buildInstall -rebuild: clean install +buildInstall: $(TARGETS) -ifeq ($(wildcard $(TOP)/config/RELEASE.$(ARCH)),$(TOP)/config/RELEASE.$(ARCH)) -cdCommands: $(TOP)/config/RELEASE.$(ARCH) -endif - -cdCommands: Makefile $(TOP)/configure/RELEASE $(TOP)/configure/CONFIG +cdCommands: $(wildcard $(TOP)/config/RELEASE*) ifeq ($(IOCS_APPL_TOP),) $(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) $@ else @@ -22,3 +15,4 @@ endif clean: @$(RM) cdCommands + diff --git a/src/makeBaseApp/top/exampleBoot/ioc/Makefile@vxWorks b/src/makeBaseApp/top/exampleBoot/ioc/Makefile@vxWorks index d5d8ef0cc..12ff7f494 100644 --- a/src/makeBaseApp/top/exampleBoot/ioc/Makefile@vxWorks +++ b/src/makeBaseApp/top/exampleBoot/ioc/Makefile@vxWorks @@ -1,8 +1,5 @@ TOP = ../.. include $(TOP)/configure/CONFIG ARCH = _ARCH_ - -# vxWorks architecture needs a cdCommands file to be built -buildInstall: cdCommands - +TARGETS = cdCommands include $(TOP)/configure/RULES.ioc