diff --git a/src/makeBaseApp/top/Makefile b/src/makeBaseApp/top/Makefile index 5749581bd..9577d4132 100644 --- a/src/makeBaseApp/top/Makefile +++ b/src/makeBaseApp/top/Makefile @@ -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 diff --git a/src/makeBaseApp/top/exampleApp/Makefile b/src/makeBaseApp/top/exampleApp/Makefile index f17aa9d47..10e0126aa 100644 --- a/src/makeBaseApp/top/exampleApp/Makefile +++ b/src/makeBaseApp/top/exampleApp/Makefile @@ -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 diff --git a/src/makeBaseApp/top/simpleApp/Makefile b/src/makeBaseApp/top/simpleApp/Makefile index 60f5ad48e..ab15bfb1c 100644 --- a/src/makeBaseApp/top/simpleApp/Makefile +++ b/src/makeBaseApp/top/simpleApp/Makefile @@ -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