From e912ad9d35ed76a8cd5f9688c7ef597029a9bc43 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 23 Feb 2006 23:43:06 +0000
Subject: [PATCH] Move conditional compilation for CURL from apps/ to funcs/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10961 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/Makefile | 11 -----------
funcs/Makefile | 11 +++++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/apps/Makefile b/apps/Makefile
index 988645d614..6b6d9ae3a3 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -32,14 +32,6 @@ ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COM
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},)
CFLAGS+=-DWITH_SMDI
endif
@@ -83,9 +75,6 @@ install: all
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
diff --git a/funcs/Makefile b/funcs/Makefile
index 7dd65246fc..9c8181c893 100644
--- a/funcs/Makefile
+++ b/funcs/Makefile
@@ -17,6 +17,14 @@ ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h $(CROSS_COMPILE_
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
@@ -35,6 +43,9 @@ clean: clean-depend
%.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
--
GitLab