[asterisk-commits] trunk r10961 - in /trunk: apps/Makefile funcs/Makefile

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Thu Feb 23 17:43:06 2006
New Revision: 10961

URL: http://svn.digium.com/view/asterisk?rev=10961&view=rev
Log:
Move conditional compilation for CURL from apps/ to funcs/

Modified:
    trunk/apps/Makefile
    trunk/funcs/Makefile

Modified: trunk/apps/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/apps/Makefile?rev=10961&r1=10960&r2=10961&view=diff
==============================================================================
--- trunk/apps/Makefile (original)
+++ trunk/apps/Makefile Thu Feb 23 17:43:06 2006
@@ -30,14 +30,6 @@
 
 ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
   MODS:=$(filter-out app_osplookup.so,$(MODS))
-endif
-
-ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
-  CURLLIBS:=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
-endif
-
-ifeq (${CURLLIBS},)
-  MODS:=$(filter-out app_curl.so,$(MODS))
 endif
 
 ifneq (${WITH_SMDI},)
@@ -83,9 +75,6 @@
 
 uninstall:
 
-app_curl.so: app_curl.o
-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS)
-
 look:	look.c
 	$(CC) -pipe -O6 -g look.c -o look -lncurses
 

Modified: trunk/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/funcs/Makefile?rev=10961&r1=10960&r2=10961&view=diff
==============================================================================
--- trunk/funcs/Makefile (original)
+++ trunk/funcs/Makefile Thu Feb 23 17:43:06 2006
@@ -17,6 +17,14 @@
   MODS:=$(filter-out func_odbc.so,$(MODS))
 endif
 
+ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
+  CURLLIBS:=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
+endif
+
+ifeq (${CURLLIBS},)
+  MODS:=$(filter-out func_curl.so,$(MODS))
+endif
+
 ifeq (${OSARCH},CYGWIN)
   CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
   CYGSOLIB=-L.. -L. -lasterisk.dll
@@ -34,6 +42,9 @@
 
 %.so : %.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
+
+func_curl.so: func_curl.o
+	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS)
 
 func_odbc.so: func_odbc.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc