[Asterisk-cvs] asterisk/apps Makefile,1.95,1.96

markster at lists.digium.com markster at lists.digium.com
Sun Mar 27 16:45:23 CST 2005


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

Modified Files:
	Makefile 
Log Message:
Fix cross compiling (bug #3868)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/Makefile,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- Makefile	27 Mar 2005 22:29:57 -0000	1.95
+++ Makefile	27 Mar 2005 22:39:16 -0000	1.96
@@ -52,18 +52,17 @@
 #APPS+=app_ivrdemo.so
 #APPS+=app_skel.so
 
-APPS+=$(shell if [ -f /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 /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 /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
+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)
 
-CURLLIBS=$(shell curl-config --libs)
+CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
 ifneq (${CURLLIBS},)
 	APPS+=app_curl.so
 	ifeq (${OSARCH},OpenBSD)
-		CFLAGS+=-I/usr/local/include
+		CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
 	endif
-endif
-
+endif 
 CFLAGS+=-fPIC
 #
 # If you have MySQL 4.1 or later you can use ODBC




More information about the svn-commits mailing list