From 475a3fdb24b2b6f0ec51f3948ec1d83a7f09febf Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 30 Aug 2005 02:54:02 +0000
Subject: clean up, use make functions instead of subshells, remove unused
 stuff

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6449 f38db490-d61c-443f-a65b-d21fe96a405b
---
 utils/Makefile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'utils')

diff --git a/utils/Makefile b/utils/Makefile
index 2ee6a5901..30a2a1fce 100755
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -16,17 +16,22 @@
 #
 CFLAGS+=-DNO_AST_MM
 
-OSARCH=$(shell uname -s)
 ifeq ($(findstring BSD,${OSARCH}),BSD)
-CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
+  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
 endif
 
 TARGET=stereorize streamplayer
 
-TARGET+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/include/popt.h ]; then echo "smsq"; else if [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h ]; then echo "smsq"; fi ; fi)
-TARGET+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/include/newt.h ]; then echo "astman"; else if [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h ]; then echo "astman"; fi ; fi)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)
+  TARGET+=smsq
+endif
+
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),)
+  TARGET+=astman
+endif
+
 ifeq (${OSARCH},SunOS)
-SOL=../strcompat.o
+  SOL=../strcompat.o
 endif
 
 all: depend $(TARGET)
@@ -64,7 +69,7 @@ streamplayer: streamplayer.o
 	$(CC) $(CFLAGS) -o streamplayer ${SOL} streamplayer.o
 
 ifneq ($(wildcard .depend),)
-include .depend
+  include .depend
 endif
 
 depend: .depend
-- 
cgit v1.2.3