kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move conditional compilation for CURL from apps/ to funcs/

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10961 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-02-23 23:43:06 +00:00
parent af1331ad56
commit e912ad9d35
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/Makefile
View File

@@ -32,14 +32,6 @@ ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COM
MODS:=$(filter-out app_osplookup.so,$(MODS)) MODS:=$(filter-out app_osplookup.so,$(MODS))
endif 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},) ifneq (${WITH_SMDI},)
CFLAGS+=-DWITH_SMDI CFLAGS+=-DWITH_SMDI
endif endif
@@ -83,9 +75,6 @@ install: all
uninstall: uninstall:
app_curl.so: app_curl.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS)
look: look.c look: look.c
$(CC) -pipe -O6 -g look.c -o look -lncurses $(CC) -pipe -O6 -g look.c -o look -lncurses

11
funcs/Makefile
View File

@@ -17,6 +17,14 @@ ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h $(CROSS_COMPILE_
MODS:=$(filter-out func_odbc.so,$(MODS)) MODS:=$(filter-out func_odbc.so,$(MODS))
endif 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) ifeq (${OSARCH},CYGWIN)
CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
CYGSOLIB=-L.. -L. -lasterisk.dll CYGSOLIB=-L.. -L. -lasterisk.dll
@@ -35,6 +43,9 @@ clean: clean-depend
%.so : %.o %.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
func_curl.so: func_curl.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS)
func_odbc.so: func_odbc.o func_odbc.so: func_odbc.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc