Fix to prevent dirs showing up multiple times when matching multiple wildcards
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
#Makefile at top of application tree
|
||||
TOP = .
|
||||
include $(TOP)/configure/CONFIG
|
||||
DIRS += configure
|
||||
DIRS += $(wildcard *App)
|
||||
DIRS += $(wildcard *app)
|
||||
DIRS += $(wildcard iocBoot)
|
||||
DIRS += $(wildcard iocboot)
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), configure)
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *App))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *app))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), iocBoot)
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), iocboot)
|
||||
include $(TOP)/configure/RULES_TOP
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
TOP = ..
|
||||
include $(TOP)/configure/CONFIG
|
||||
DIRS += $(wildcard *src*)
|
||||
DIRS += $(wildcard *Src*)
|
||||
DIRS += $(wildcard *db*)
|
||||
DIRS += $(wildcard *Db*)
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
|
||||
include $(TOP)/configure/RULES_DIRS
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
TOP = ..
|
||||
include $(TOP)/configure/CONFIG
|
||||
DIRS += $(wildcard *src*)
|
||||
DIRS += $(wildcard *Src*)
|
||||
DIRS += $(wildcard *db*)
|
||||
DIRS += $(wildcard *Db*)
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
|
||||
include $(TOP)/configure/RULES_DIRS
|
||||
|
||||
Reference in New Issue
Block a user