From 18cafc2d067148e35e03d089127a0bc202e4b930 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Wed, 5 Feb 1997 19:32:49 +0000 Subject: [PATCH] replace shell commands with wildcard --- src/tools/makeBaseApp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/tools/makeBaseApp b/src/tools/makeBaseApp index 023abf224..332c3cbdd 100755 --- a/src/tools/makeBaseApp +++ b/src/tools/makeBaseApp @@ -51,7 +51,7 @@ if [ ! -f Makefile ]; then cat > Makefile <<-\END TOP = . include $(TOP)/config/CONFIG_APP - DIRS += $(shell ls | grep App ) + DIRS += $(wildcard *App*) DIRS += iocBoot include $(TOP)/config/RULES_TOP END @@ -63,6 +63,7 @@ if [ ! -d config ]; then #CONFIG # Add any changes to make rules here #CROSS_COMPILER_TARGET_ARCHS = mv167 + VX_WARN_YES = -Wall -pedantic END cat > config/CONFIG_APP <<-\END #CONFIG_APP DO NOT EDIT THIS FILE @@ -98,7 +99,9 @@ if [ ! -d config ]; then cat > config/RULES.Vx <<-\END #RULES.Vx include $(EPICS_BASE)/config/RULES.Vx - VX_WARN_YES = -Wall -pedantic + inc:: $(INSTALL_INCREC) + $(LIBNAME): ../baseLIBOBJS + $(DBDNAME): ../base.dbd $(RECTYPES:%.h=../%.dbd) END cat > config/RULES.ioc <<-\END #RULES.ioc @@ -142,8 +145,8 @@ do cat > Makefile <<-\END TOP = .. include $(TOP)/config/CONFIG_APP - DIRS += $(shell ls | grep src ) - DIRS += $(shell ls | grep Db ) + DIRS += $(wildcard *src*) + DIRS += $(wildcard *Db*) include $(TOP)/config/RULES_DIRS END mkdir Db @@ -831,7 +834,7 @@ do cat > iocBoot/Makefile <<-\END TOP = .. include $(TOP)/config/CONFIG_APP - DIRS += $(shell ls | grep ioc ) + DIRS += $(wildcard *ioc*) include $(TOP)/config/RULES_DIRS END fi