From 32337b7e7fba87773646a89fa4255eb515db542c Mon Sep 17 00:00:00 2001 From: kpfleming Date: Sat, 11 Feb 2006 17:12:05 +0000 Subject: use auto-build for apps, simplify variable setting git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9564 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/Makefile | 67 +++++++++++++++++++++++----------------------------------- funcs/Makefile | 10 ++++----- res/Makefile | 6 +++--- 3 files changed, 35 insertions(+), 48 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index b3fb93071..b8a6b91f0 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -3,7 +3,7 @@ # # Makefile for PBX applications # -# Copyright (C) 1999-2005, Digium +# Copyright (C) 1999-2006, Digium, Inc. # # Mark Spencer # @@ -11,58 +11,45 @@ # the GNU General Public License # -APPS=app_adsiprog.so app_alarmreceiver.so app_authenticate.so app_cdr.so \ - app_chanisavail.so app_chanspy.so app_controlplayback.so app_db.so \ - app_dial.so app_dictate.so app_directed_pickup.so app_directory.so \ - app_disa.so app_dumpchan.so app_echo.so app_exec.so app_externalivr.so \ - app_festival.so app_forkcdr.so app_getcpeid.so app_hasnewvoicemail.so \ - app_ices.so app_image.so app_lookupblacklist.so app_lookupcidname.so \ - app_macro.so app_milliwatt.so app_mixmonitor.so app_mp3.so app_nbscat.so \ - app_parkandannounce.so app_playback.so app_privacy.so app_queue.so \ - app_random.so app_read.so app_readfile.so app_realtime.so app_record.so \ - app_sayunixtime.so app_senddtmf.so app_sendtext.so app_setcallerid.so \ - app_setcdruserfield.so app_settransfercapability.so app_softhangup.so \ - app_stack.so app_system.so app_talkdetect.so app_test.so app_transfer.so \ - app_userevent.so app_url.so app_verbose.so app_voicemail.so \ - app_waitforring.so app_waitforsilence.so app_while.so app_zapateller.so \ - app_morsecode.so +MODS:=$(patsubst %.c,%.so,$(wildcard app_*.c)) # # Experimental things # -#APPS+=app_ivrdemo.so -#APPS+=app_skel.so -#APPS+=app_rpt.so +MODS:=$(filter-out app_ivrdemo.so,$(MODS)) +MODS:=$(filter-out app_skel.so,$(MODS)) +MODS:=$(filter-out app_rpt.so,$(MODS)) ifndef WITHOUT_ZAPTEL -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 app_page.so +ZAPAVAIL:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h) endif -endif # WITHOUT_ZAPTEL -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) -APPS+=app_osplookup.so +ifeq (${ZAPAVAIL},) + MODS:=$(filter-out app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so,$(MODS)) +endif + +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 -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 - endif + CURLLIBS:=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) endif -ifeq (${OSARCH},CYGWIN) -CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols -CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so -lres_adsi.so -lres_monitor.so -else -CFLAGS+=-fPIC -APPS+=app_sms.so +ifeq (${CURLLIBS},) + MODS:=$(filter-out app_curl.so,$(MODS)) endif -# Asterisk SMDI integration -# -ifeq (${WITH_SMDI},1) -CFLAGS+=-DWITH_SMDI +ifneq (${WITH_SMDI},) + CFLAGS+=-DWITH_SMDI +endif + +ifeq (${OSARCH},CYGWIN) + CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols + CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so -lres_adsi.so -lres_monitor.so + MODS:=$(filter-out app_sms.so,$(MODS)) +else + CFLAGS+=-fPIC endif # If you have UnixODBC you can use ODBC voicemail @@ -74,7 +61,7 @@ endif #CFLAGS+=-DEXTENDED_ODBC_STORAGE # See doc/README.odbcstorage for more information -all: $(APPS) +all: $(MODS) clean: rm -f *.so *.o look .depend @@ -86,7 +73,7 @@ app_rpt.so : app_rpt.o $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone install: all - for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done + for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done rm -f $(DESTDIR)$(MODULES_DIR)/app_cut.so rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so diff --git a/funcs/Makefile b/funcs/Makefile index 1350fd725..493ec3a9a 100644 --- a/funcs/Makefile +++ b/funcs/Makefile @@ -3,7 +3,7 @@ # # Makefile for dialplan functions # -# Copyright (C) 2005 - 2006, Digium +# Copyright (C) 2005-2006, Digium, Inc. # # Kevin P. Fleming # @@ -13,15 +13,15 @@ MODS:=$(patsubst %.c,%.so,$(wildcard func_*.c)) -ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) +ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) MODS:=$(filter-out func_odbc.so,$(MODS)) endif ifeq (${OSARCH},CYGWIN) -CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols -CYGSOLIB=-L.. -L. -lasterisk.dll + CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols + CYGSOLIB=-L.. -L. -lasterisk.dll else -CFLAGS+=-fPIC + CFLAGS+=-fPIC endif all: $(MODS) diff --git a/res/Makefile b/res/Makefile index bbbabf396..01cdc4017 100644 --- a/res/Makefile +++ b/res/Makefile @@ -3,7 +3,7 @@ # # Makefile for resource modules # -# Copyright (C) 1999-2005, Digium +# Copyright (C) 1999-2006, Digium # # Mark Spencer # @@ -13,7 +13,7 @@ MODS:=$(patsubst %.c,%.so,$(wildcard res_*.c)) -ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) +ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) MODS:=$(filter-out res_odbc.so,$(MODS)) MODS:=$(filter-out res_config_odbc.so,$(MODS)) else @@ -26,7 +26,7 @@ ifneq ($(NOCRYPTO),yes) MODS:=$(filter-out res_crypto.so,$(MODS)) endif -OSPLIB=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a) +OSPLIB:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a) ifeq (${OSPLIB},) MODS:=$(filter-out res_osp.so,$(MODS)) endif -- cgit v1.2.3