From 5a2a33f3e0db933a5c90d972e6016edbd66eecfb Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 26 May 2004 17:49:01 +0000 Subject: [PATCH] Moved wildcards from unnecessary file configure/RULES.iocBoot to iocBoot/Makefile --- src/makeBaseApp/Makefile | 1 - src/makeBaseApp/top/configure/RULES.iocBoot | 4 ---- src/makeBaseApp/top/exampleBoot/Makefile | 5 ++++- src/makeBaseApp/top/iocBoot/Makefile | 5 ++++- 4 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 src/makeBaseApp/top/configure/RULES.iocBoot diff --git a/src/makeBaseApp/Makefile b/src/makeBaseApp/Makefile index ba6a80ffb..d44ea5032 100644 --- a/src/makeBaseApp/Makefile +++ b/src/makeBaseApp/Makefile @@ -11,7 +11,6 @@ TEMPLATES += top/configure/Makefile TEMPLATES += top/configure/RELEASE TEMPLATES += top/configure/RULES TEMPLATES += top/configure/RULES.ioc -TEMPLATES += top/configure/RULES.iocBoot TEMPLATES += top/configure/RULES_DIRS TEMPLATES += top/configure/RULES_TOP diff --git a/src/makeBaseApp/top/configure/RULES.iocBoot b/src/makeBaseApp/top/configure/RULES.iocBoot deleted file mode 100644 index 7bb3b3b30..000000000 --- a/src/makeBaseApp/top/configure/RULES.iocBoot +++ /dev/null @@ -1,4 +0,0 @@ -#RULES.iocBoot -DIRS += $(wildcard *ioc*) -DIRS += $(wildcard as*) -include $(EPICS_BASE)/configure/RULES_DIRS diff --git a/src/makeBaseApp/top/exampleBoot/Makefile b/src/makeBaseApp/top/exampleBoot/Makefile index 252a13709..d097ef0ad 100644 --- a/src/makeBaseApp/top/exampleBoot/Makefile +++ b/src/makeBaseApp/top/exampleBoot/Makefile @@ -1,3 +1,6 @@ TOP = .. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES.iocBoot +DIRS += $(wildcard *ioc*) +DIRS += $(wildcard as*) +include $(EPICS_BASE)/configure/RULES_DIRS + diff --git a/src/makeBaseApp/top/iocBoot/Makefile b/src/makeBaseApp/top/iocBoot/Makefile index 252a13709..d097ef0ad 100644 --- a/src/makeBaseApp/top/iocBoot/Makefile +++ b/src/makeBaseApp/top/iocBoot/Makefile @@ -1,3 +1,6 @@ TOP = .. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES.iocBoot +DIRS += $(wildcard *ioc*) +DIRS += $(wildcard as*) +include $(EPICS_BASE)/configure/RULES_DIRS +