Moved wildcards from unnecessary file configure/RULES.iocBoot to iocBoot/Makefile

2004-05-26 17:49:01 +00:00
parent 36809d6d20
commit 5a2a33f3e0
4 changed files with 8 additions and 7 deletions
--- 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

--- a/src/makeBaseApp/top/configure/RULES.iocBoot
+++ b/src/makeBaseApp/top/configure/RULES.iocBoot
@@ -1,4 +0,0 @@
-#RULES.iocBoot
-DIRS += $(wildcard *ioc*)
-DIRS += $(wildcard as*)
-include $(EPICS_BASE)/configure/RULES_DIRS
--- 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
+
--- 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
+