[asterisk-commits] branch murf/AEL2 r9583 - in /team/murf/AEL2: ./
apps/ cdr/ channels/ codecs/ ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Feb 11 11:35:15 MST 2006
Author: murf
Date: Sat Feb 11 12:35:06 2006
New Revision: 9583
URL: http://svn.digium.com/view/asterisk?rev=9583&view=rev
Log:
Merged revisions 8232,8242,8276,8281,8320,8347,8394,8412,8414,8418 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8232 | russell | 2006-01-18 21:17:45 -0700 (Wed, 18 Jan 2006) | 3 lines
fix a seg fault due to assuming that space gets allocatted on the stack in the
same order that we declare the variables (issue #6290)
........
r8242 | russell | 2006-01-18 21:56:48 -0700 (Wed, 18 Jan 2006) | 3 lines
fix Message-Account header to use the ip address if the fromdomain
isn't set (issue #6278)
........
r8276 | tilghman | 2006-01-19 12:14:37 -0700 (Thu, 19 Jan 2006) | 2 lines
Bug 6072 - Memory leaks in the expression parser
........
r8281 | oej | 2006-01-19 12:40:28 -0700 (Thu, 19 Jan 2006) | 2 lines
Enable "musicclass" setting for sip peers as per the config sample.
........
r8320 | mogorman | 2006-01-19 18:00:46 -0700 (Thu, 19 Jan 2006) | 3 lines
solved problem with delayreject and iax trunking
bug 4291
........
r8347 | russell | 2006-01-20 11:34:42 -0700 (Fri, 20 Jan 2006) | 2 lines
fix invalid value of prev_q (issue #6302)
........
r8394 | tilghman | 2006-01-21 11:29:39 -0700 (Sat, 21 Jan 2006) | 2 lines
Bug 5936 - AddQueueMember fails on realtime queue, if queue not yet loaded
........
r8412 | russell | 2006-01-21 16:17:06 -0700 (Sat, 21 Jan 2006) | 2 lines
prevent the possibility of writing outside of the available workspace (issue #6271)
........
r8414 | russell | 2006-01-21 16:43:14 -0700 (Sat, 21 Jan 2006) | 2 lines
temporarily revert substring fix pending the result of the discussion in issue #6271
........
r8418 | russell | 2006-01-21 19:05:41 -0700 (Sat, 21 Jan 2006) | 3 lines
add a modified fix to prevent writing outside of the provided workspace when
calculating a substring (issue #6271)
........
Removed:
team/murf/AEL2/channels/adtranvofr.h
team/murf/AEL2/channels/chan_oss_old.c
Modified:
team/murf/AEL2/ (props changed)
team/murf/AEL2/apps/Makefile
team/murf/AEL2/cdr/Makefile
team/murf/AEL2/channels/Makefile
team/murf/AEL2/codecs/Makefile
team/murf/AEL2/formats/Makefile
team/murf/AEL2/funcs/Makefile
team/murf/AEL2/pbx/Makefile
team/murf/AEL2/res/Makefile
Propchange: team/murf/AEL2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb 11 12:35:06 2006
@@ -1,1 +1,1 @@
-/trunk:1-9556
+/trunk:1-9580
Modified: team/murf/AEL2/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/Makefile?rev=9583&r1=9582&r2=9583&view=diff
==============================================================================
--- team/murf/AEL2/apps/Makefile (original)
+++ team/murf/AEL2/apps/Makefile Sat Feb 11 12:35:06 2006
@@ -3,7 +3,7 @@
#
# Makefile for PBX applications
#
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -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
-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
+ZAPAVAIL:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)
endif
-CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
+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
+
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 (${CURLLIBS},)
+ MODS:=$(filter-out app_curl.so,$(MODS))
+endif
+
+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
+ 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
-APPS+=app_sms.so
-endif
-
-# Asterisk SMDI integration
-#
-ifeq (${WITH_SMDI},1)
-CFLAGS+=-DWITH_SMDI
+ CFLAGS+=-fPIC
endif
# If you have UnixODBC you can use ODBC voicemail
@@ -74,7 +61,7 @@
#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 @@
$(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
Modified: team/murf/AEL2/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/cdr/Makefile?rev=9583&r1=9582&r2=9583&view=diff
==============================================================================
--- team/murf/AEL2/cdr/Makefile (original)
+++ team/murf/AEL2/cdr/Makefile Sat Feb 11 12:35:06 2006
@@ -1,9 +1,9 @@
#
# Asterisk -- A telephony toolkit for Linux.
#
-# Makefile for CDR backends (dynamically loaded)
+# Makefile for CDR backends
#
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -11,13 +11,30 @@
# the GNU General Public License
#
-MODS=cdr_csv.so cdr_manager.so cdr_custom.so
+MODS:=$(patsubst %.c,%.so,$(wildcard cdr_*.c))
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
+ MODS:=$(filter-out cdr_odbc.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include $(CROSS_COMPILE_TARGET)/usr/include/pgsql $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql $(CROSS_COMPILE_TARGET)/opt/pgsql/include $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
+ MODS:=$(filter-out cdr_pgsql.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sqlite.h),)
+ MODS:=$(filter-out cdr_sqlite.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
+ MODS:=$(filter-out cdr_tds.so,$(MODS))
+ NOTDS=1
+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
ifeq ($(findstring BSD,${OSARCH}),BSD)
@@ -31,21 +48,11 @@
#So we go lowest common available by gcc and go a step down, still a step up from
#the default as we now have a better instruction set to work with. - Belgarath
ifeq ($(PROC),sparc64)
- PROC=ultrasparc
+ PROC=ultrasparc
CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
endif
-#
-# unixODBC stuff...
-#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
- MODS+=cdr_odbc.so
-endif
-
-#
-# FreeTDS stuff...
-#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
+ifeq (${NOTDS},)
ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
CFLAGS += -DFREETDS_0_63
else
@@ -55,14 +62,6 @@
CFLAGS += -DFREETDS_PRE_0_62
endif
endif
- MODS+=cdr_tds.so
-endif
-
-#
-# PGSQL stuff... Autoconf anyone??
-#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
- MODS+=cdr_pgsql.so
endif
MLFLAGS=
@@ -100,13 +99,6 @@
MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib
endif
-#
-# SQLite stuff...
-#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sqlite.h),)
- MODS+=cdr_sqlite.so
-endif
-
all: depend $(MODS)
install: all
Modified: team/murf/AEL2/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/channels/Makefile?rev=9583&r1=9582&r2=9583&view=diff
==============================================================================
--- team/murf/AEL2/channels/Makefile (original)
+++ team/murf/AEL2/channels/Makefile Sat Feb 11 12:35:06 2006
@@ -3,7 +3,7 @@
#
# Makefile for channel drivers
#
-# Copyright (C) 1999-2005, Mark Spencer
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -14,7 +14,7 @@
# the GNU General Public License
#
-CHANNEL_LIBS=chan_sip.so chan_agent.so chan_mgcp.so chan_iax2.so chan_local.so chan_skinny.so chan_features.so
+MODS:=$(patsubst %.c,%.so,$(wildcard chan_*.c))
ifeq (${OSARCH},OpenBSD)
PTLIB=-lpt_OpenBSD_x86_r
@@ -28,9 +28,9 @@
endif
ifeq (${OSARCH},CYGWIN)
-CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
-CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so
-CYG_CHAN_AGENT=-lres_monitor.so
+ CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
+ CYGSOLIB=-L.. -L. -L../res -lasterisk.dll -lres_features.so
+ CYG_CHAN_AGENT=-lres_monitor.so
endif
ifeq ($(PROC),sparc64)
@@ -49,52 +49,51 @@
H323LIB=-lh323_NetBSD_x86_r
endif
-ifneq (${OSARCH},Darwin)
- ifneq (${OSARCH},SunOS)
- ifneq (${OSARCH},CYGWIN)
- CHANNEL_LIBS+=chan_oss.so
- endif
- endif
+ifeq (${OSARCH},Darwin)
+ MODS:=$(filter-out chan_oss.so,$(MODS))
endif
ifeq (${OSARCH},SunOS)
+ MODS:=$(filter-out chan_oss.so,$(MODS))
SOLINK+=-lrt
endif
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
- CHANNEL_LIBS+=chan_phone.so
-endif
-
-#
-# Asterisk SMDI integration
-#
+ifeq (${OSARCH},CYGWIN)
+ MODS:=$(filter-out chan_oss.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
+ MODS:=$(filter-out chan_phone.so,$(MODS))
+endif
+
ifeq (${WITH_SMDI},1)
CFLAGS+=-DWITH_SMDI
endif
-ifneq ($(wildcard h323/libchanh323.a),)
- CHANNEL_LIBS+=chan_h323.so
-endif
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
- CHANNEL_LIBS+=chan_misdn.so
+ifeq ($(wildcard h323/libchanh323.a),)
+ MODS:=$(filter-out chan_h323.so,$(MODS))
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
+ MODS:=$(filter-out chan_misdn.so,$(MODS))
+else
CFLAGS+=-Imisdn
endif
CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
- CHANNEL_LIBS+=chan_alsa.so
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
+ MODS:=$(filter-out chan_alsa.so,$(MODS))
endif
ifndef WITHOUT_PRI
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1 $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
CFLAGS+=-DZAPATA_PRI
ZAPPRI=-lpri
endif
endif # WITHOUT_PRI
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1 $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
CFLAGS+=-DZAPATA_R2
ZAPR2=-lmfcr2
endif
@@ -107,7 +106,12 @@
endif
ifndef WITHOUT_ZAPTEL
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
+ZAPAVAIL:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)
+endif
+
+ifeq (${ZAPAVAIL},)
+ MODS:=$(filter-out chan_zap.so,$(MODS))
+else
ifeq (${OSARCH},NetBSD)
SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
endif
@@ -115,27 +119,26 @@
SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
CFLAGS+=-DIAX_TRUNKING
- CHANNEL_LIBS+=chan_zap.so
-endif
-endif # WITHOUT_ZAPTEL
-
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
- CHANNEL_LIBS+=chan_vpb.so
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
+ MODS:=$(filter-out chan_vpb.so,$(MODS))
+else
CFLAGS+=-DLINUX
endif
CFLAGS+=-DCRYPTO
ifneq ($(OSARCH),CYGWIN)
-CFLAGS+=-fPIC
+ CFLAGS+=-fPIC
endif
CFLAGS+=#-DVOFRDUMPER
ZAPDIR=/usr/lib
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
- CHANNEL_LIBS+=chan_nbs.so
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
+ MODS:=$(filter-out chan_nbs.so,$(MODS))
endif
ifndef OPENH323DIR
@@ -146,9 +149,7 @@
PWLIBDIR=$(HOME)/pwlib
endif
-#CFLAGS+=$(shell [ -f $(ZAPDIR)/libzap.a ] && echo "-I$(ZAPDIR)")
-
-all: depend $(CHANNEL_LIBS)
+all: depend $(MODS)
clean:
rm -f *.so *.o .depend
@@ -245,8 +246,7 @@
install: all
- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
- if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
+ for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
uninstall:
Modified: team/murf/AEL2/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/codecs/Makefile?rev=9583&r1=9582&r2=9583&view=diff
==============================================================================
--- team/murf/AEL2/codecs/Makefile (original)
+++ team/murf/AEL2/codecs/Makefile Sat Feb 11 12:35:06 2006
@@ -3,7 +3,7 @@
#
# Makefile for codec modules
#
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -11,74 +11,57 @@
# the GNU General Public License
#
+MODS:=$(patsubst %.c,%.so,$(wildcard codec_*.c))
+
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
-ifneq ($(wildcard g723.1/coder.c),)
- MODG723=codec_g723_1.so
+ifeq ($(wildcard g723.1/coder.c),)
+ MODS:=$(filter-out codec_g723_1.so,$(MODS))
+else
LIBG723=g723.1/libg723.a
endif
-ifneq ($(wildcard g723.1b/coder2.c),)
- MODG723+=codec_g723_1b.so
+ifeq ($(wildcard g723.1b/coder2.c),)
+ MODS:=$(filter-out codec_g723_1b.so,$(MODS))
+else
LIBG723B=g723.1b/libg723b.a
endif
-UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h)
-UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h)
-ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h)
-ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h)
-ifneq (${UI_SPEEX},)
- MODSPEEX=codec_speex.so
- LIBSPEEX+=-lspeex -lm
-endif
-ifneq (${UIS_SPEEX},)
- MODSPEEX=codec_speex.so
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/speex
- LIBSPEEX+=-lspeex -lm
-endif
-ifneq (${ULI_SPEEX},)
- MODSPEEX=codec_speex.so
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
- LIBSPEEX+=-lspeex -lm
-endif
-ifneq (${ULIS_SPEEX},)
- MODSPEEX=codec_speex.so
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex
- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
- LIBSPEEX+=-lspeex -lm
+SPEEX_PATH:=/usr/local/include /usr/include /usr/include/speex /usr/local/include/speex
+SPEEX_SYSTEM_HEADERS:=$(wildcard $(SPEEX_PATH:%=$(CROSS_COMPILE_TARGET)%/speex.h))
+ifeq (${SPEEX_SYSTEM_HEADERS},)
+ MODS:=$(filter-out codec_speex.so,$(MODS))
+else
+ CFLAGS+=-I$(subst /speex.h,,${SPEEX_SYSTEM_HEADERS})
+ LIBSPEEX=-lspeex -lm
endif
-ifneq ($(wildcard ilbc/iLBC_decode.h),)
- MODILBC=codec_ilbc.so
+ifeq ($(wildcard ilbc/iLBC_decode.h),)
+ MODS:=$(filter-out codec_ilbc.so,$(MODS))
+else
LIBILBC=ilbc/libilbc.a
endif
-
LIBGSM_PATH:=/usr/local/include /usr/include
LIBGSM_SYSTEM_HEADERS:=$(wildcard $(LIBGSM_PATH:%=$(CROSS_COMPILE_TARGET)%/gsm/gsm.h))
-ifneq (,$(LIBGSM_SYSTEM_HEADERS))
-LIBGSM=-lgsm
-LIBGSMT=
-CFLAGS+=-DUSE_EXTERNAL_GSM_LIB
+ifneq ($(LIBGSM_SYSTEM_HEADERS),)
+ LIBGSM=-lgsm
+ LIBGSMT=
+ CFLAGS+=-DUSE_EXTERNAL_GSM_LIB
else
-LIBGSM=gsm/lib/libgsm.a
-LIBGSMT=$(LIBGSM)
-CFLAGS+=-I.
+ LIBGSM=gsm/lib/libgsm.a
+ LIBGSMT=$(LIBGSM)
+ CFLAGS+=-I.
endif
LIBLPC10=lpc10/liblpc10.a
-CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \
- codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
- codec_g726.so
-
-all: depend $(CODECS)
+all: depend $(MODS)
clean:
rm -f *.so *.o .depend
@@ -118,7 +101,7 @@
codec_gsm.so: codec_gsm.o $(LIBGSMT)
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBGSM)
-$(MODSPEEX): codec_speex.o
+codec_speex.so: codec_speex.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(LIBSPEEX)
codec_lpc10.so: codec_lpc10.o $(LIBLPC10)
@@ -132,7 +115,7 @@
endif
install: all
- for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
uninstall:
Modified: team/murf/AEL2/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/formats/Makefile?rev=9583&r1=9582&r2=9583&view=diff
==============================================================================
--- team/murf/AEL2/formats/Makefile (original)
+++ team/murf/AEL2/formats/Makefile Sat Feb 11 12:35:06 2006
@@ -3,7 +3,7 @@
#
# Makefile for file format modules
#
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -11,33 +11,25 @@
# the GNU General Public License
#
-FORMAT_LIBS=format_gsm.so format_wav.so \
- format_wav_gsm.so format_vox.so format_pcm.so format_g729.so \
- format_pcm_alaw.so format_h263.so format_g726.so format_ilbc.so \
- format_sln.so format_au.so format_h264.so
-FORMAT_LIBS+=format_jpeg.so
-
-#
-# G723 simple frame is deprecated
-#
-FORMAT_LIBS+=format_g723.so
+MODS:=$(patsubst %.c,%.so,$(wildcard format_*.c))
#
# OGG/Vorbis format
#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
- FORMAT_LIBS+=format_ogg_vorbis.so
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
+ MODS:=$(filter-out format_ogg_vorbis.so,$(MODS))
endif
GSMLIB=../codecs/gsm/lib/libgsm.a
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: depend $(FORMAT_LIBS)
+
+all: depend $(MODS)
clean:
rm -f *.so *.o .depend
@@ -56,7 +48,7 @@
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm
install: all
- for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
uninstall:
Modified: team/murf/AEL2/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/funcs/Makefile?rev=9583&r1=9582&r2=9583&view=diff
==============================================================================
--- team/murf/AEL2/funcs/Makefile (original)
+++ team/murf/AEL2/funcs/Makefile Sat Feb 11 12:35:06 2006
@@ -3,7 +3,7 @@
#
# Makefile for dialplan functions
#
-# Copyright (C) 2005 - 2006, Digium
+# Copyright (C) 2005-2006, Digium, Inc.
#
# Kevin P. Fleming <kpfleming at digium.com>
#
@@ -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)
Modified: team/murf/AEL2/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/pbx/Makefile?rev=9583&r1=9582&r2=9583&view=diff
==============================================================================
--- team/murf/AEL2/pbx/Makefile (original)
+++ team/murf/AEL2/pbx/Makefile Sat Feb 11 12:35:06 2006
@@ -3,7 +3,7 @@
#
# Makefile for PBX modules
#
-# Copyright (C) 1999-2005, Mark Spencer
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -11,13 +11,17 @@
# the GNU General Public License
#
-PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so pbx_realtime.so \
- pbx_ael.so pbx_ael2.so
+MODS:=$(patsubst %.c,%.so,$(wildcard pbx_*.c))
-# Add GTK console if appropriate
-#PBX_LIBS+=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
-# Add KDE Console if appropriate
-#PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so")
+#GTK=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null 2>/dev/null && echo "OK")
+ifeq (${GTK},)
+ MODS:=$(filter-out pbx_gtkconsole.so,$(MODS))
+endif
+
+#KDE=$(shell [ "$$QTDIR" != "" ] && echo "OK")
+ifeq (${GTK},)
+ MODS:=$(filter-out pbx_kdeconsole.so,$(MODS))
+endif
GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread`
GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread`
@@ -26,15 +30,15 @@
KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui
ifeq (${OSARCH},CYGWIN)
-CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
-CYGSOLIB=-L.. -L. -L../res -lasterisk.dll
+ CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
+ CYGSOLIB=-L.. -L. -L../res -lasterisk.dll
else
-CFLAGS+=-fPIC
+ CFLAGS+=-fPIC
endif
KDE_CONSOLE_OBJS=pbx_kdeconsole_main.o pbx_kdeconsole.o
-all: depend $(PBX_LIBS)
+all: depend $(MODS)
clean:
rm -f *.so *.o .depend
@@ -98,7 +102,7 @@
endif
install: all
- for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
$(INSTALL) -m 755 applist $(DESTDIR)$(ASTVARLIBDIR)/
uninstall:
Modified: team/murf/AEL2/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/res/Makefile?rev=9583&r1=9582&r2=9583&view=diff
==============================================================================
--- team/murf/AEL2/res/Makefile (original)
+++ team/murf/AEL2/res/Makefile Sat Feb 11 12:35:06 2006
@@ -3,7 +3,7 @@
#
# Makefile for resource modules
#
-# Copyright (C) 1999-2005, Digium
+# Copyright (C) 1999-2006, Digium
#
# Mark Spencer <markster at digium.com>
#
@@ -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 @@
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
More information about the asterisk-commits
mailing list