[Asterisk-cvs] asterisk/apps Makefile,1.107,1.108

[kpfleming]

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

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


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/Makefile,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- Makefile	29 Aug 2005 19:07:24 -0000	1.107
+++ Makefile	30 Aug 2005 02:54:01 -0000	1.108
@@ -11,7 +11,6 @@
 # the GNU General Public License
 #
 
-#APPS=app_dial.so app_playback.so app_directory.so app_intercom.so app_mp3.so 
 APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_mp3.so\
      app_system.so app_echo.so app_record.so app_image.so app_url.so app_disa.so \
      app_adsiprog.so app_getcpeid.so app_milliwatt.so \
@@ -31,12 +30,6 @@
      app_md5.so app_readfile.so app_chanspy.so app_settransfercapability.so \
      app_dictate.so app_externalivr.so
 
-ifneq (${OSARCH},Darwin)
-ifneq (${OSARCH},SunOS)
-#APPS+=app_intercom.so
-endif
-endif
-
 #
 # Obsolete things...
 #
@@ -50,27 +43,34 @@
 #APPS+=app_skel.so
 #APPS+=app_rpt.so
 
-APPS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
-APPS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
-APPS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
+  APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so
+endif
+
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+APPS+=app_osplookup.so
+endif
+
+ifeq ($(findstring BSD,${OSARCH}),BSD)
+CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
+endif
 
 CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
 ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
-	ifneq (${CURLLIBS},)
-		APPS+=app_curl.so
-		ifeq (${OSARCH},OpenBSD)
-			CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
-		endif
-	endif 
+  ifneq (${CURLLIBS},)
+    APPS+=app_curl.so
+  endif 
 endif
+
 CFLAGS+=-fPIC
+
 #
-# If you have MySQL 4.1 or later you can use ODBC
+# If you have UnixODBC you can use ODBC voicemail
 # storage
 #
-# Uncomment to use odbc storage
+# Uncomment to use ODBC storage
 #CFLAGS+=-DUSE_ODBC_STORAGE
-# Uncomment for extended odbc voicemail storage
+# Uncomment for extended ODBC voicemail storage
 #CFLAGS+=-DEXTENDED_ODBC_STORAGE
 # See doc/README.odbcstorage for more information
 
@@ -112,7 +112,7 @@
 
 
 ifneq ($(wildcard .depend),)
-include .depend
+ include .depend
 endif
 
 depend: .depend