[Asterisk-cvs] asterisk/utils Makefile,1.15,1.16

[kpfleming]

Update of /usr/cvsroot/asterisk/utils
In directory mongoose.digium.com:/tmp/cvs-serv15792/utils

Modified Files:
	Makefile 
Log Message:
clean up, use make functions instead of subshells, remove unused stuff


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/utils/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	29 Aug 2005 22:03:37 -0000	1.15
+++ Makefile	30 Aug 2005 02:54:02 -0000	1.16
@@ -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 @@
 	$(CC) $(CFLAGS) -o streamplayer ${SOL} streamplayer.o
 
 ifneq ($(wildcard .depend),)
-include .depend
+  include .depend
 endif
 
 depend: .depend