[asterisk-addons-commits] qwell: branch qwell/moddir_14 r527 - in /team/qwell/moddir_14: ./ apps/ aster...
SVN commits to the Asterisk addons project
asterisk-addons-commits at lists.digium.com
Wed Feb 13 16:32:46 CST 2008
Author: qwell
Date: Wed Feb 13 16:32:44 2008
New Revision: 527
URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=527
Log:
Progress?
Added:
team/qwell/moddir_14/Makefile.moddir_rules (with props)
team/qwell/moddir_14/apps/ (with props)
team/qwell/moddir_14/apps/Makefile (with props)
team/qwell/moddir_14/apps/app_addon_sql_mysql.c (contents, props changed)
- copied, changed from r525, branches/1.4/app_addon_sql_mysql.c
team/qwell/moddir_14/apps/app_saycountpl.c (contents, props changed)
- copied, changed from r525, branches/1.4/app_saycountpl.c
team/qwell/moddir_14/build_tools/get_makeopts (with props)
team/qwell/moddir_14/build_tools/get_moduleinfo (with props)
team/qwell/moddir_14/cdr/ (with props)
team/qwell/moddir_14/cdr/Makefile (with props)
team/qwell/moddir_14/cdr/cdr_addon_mysql.c (contents, props changed)
- copied, changed from r525, branches/1.4/cdr_addon_mysql.c
team/qwell/moddir_14/channels/ (with props)
team/qwell/moddir_14/channels/Makefile (with props)
team/qwell/moddir_14/channels/chan_ooh323.c (contents, props changed)
- copied, changed from r526, team/qwell/moddir_14/asterisk-ooh323c/src/chan_h323.c
team/qwell/moddir_14/channels/chan_ooh323.h (props changed)
- copied unchanged from r526, team/qwell/moddir_14/asterisk-ooh323c/src/chan_h323.h
team/qwell/moddir_14/channels/ooh323c/
- copied from r526, team/qwell/moddir_14/asterisk-ooh323c/ooh323c/
team/qwell/moddir_14/channels/ooh323cDriver.c (props changed)
- copied unchanged from r525, branches/1.4/asterisk-ooh323c/src/ooh323cDriver.c
team/qwell/moddir_14/channels/ooh323cDriver.h (contents, props changed)
- copied, changed from r525, branches/1.4/asterisk-ooh323c/src/ooh323cDriver.h
team/qwell/moddir_14/configs/ooh323.conf.sample (props changed)
- copied unchanged from r525, branches/1.4/asterisk-ooh323c/h323.conf.sample
team/qwell/moddir_14/doc/ChangeLog.chan_ooh323 (props changed)
- copied unchanged from r526, team/qwell/moddir_14/asterisk-ooh323c/ChangeLog
team/qwell/moddir_14/doc/chan_ooh323.txt (props changed)
- copied unchanged from r526, team/qwell/moddir_14/asterisk-ooh323c/README
team/qwell/moddir_14/formats/ (with props)
team/qwell/moddir_14/formats/Makefile (with props)
team/qwell/moddir_14/formats/format_mp3.c (contents, props changed)
- copied, changed from r525, branches/1.4/format_mp3/format_mp3.c
team/qwell/moddir_14/formats/mp3/
- copied from r525, branches/1.4/format_mp3/
team/qwell/moddir_14/formats/mp3/MPGLIB_README (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/MPGLIB_README
team/qwell/moddir_14/formats/mp3/MPGLIB_TODO (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/MPGLIB_TODO
team/qwell/moddir_14/formats/mp3/Makefile (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/Makefile
team/qwell/moddir_14/formats/mp3/README (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/README
team/qwell/moddir_14/formats/mp3/common.c (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/common.c
team/qwell/moddir_14/formats/mp3/dct64_i386.c (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/dct64_i386.c
team/qwell/moddir_14/formats/mp3/decode_i386.c (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/decode_i386.c
team/qwell/moddir_14/formats/mp3/decode_ntom.c (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/decode_ntom.c
team/qwell/moddir_14/formats/mp3/huffman.h (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/huffman.h
team/qwell/moddir_14/formats/mp3/interface.c (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/interface.c
team/qwell/moddir_14/formats/mp3/layer3.c (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/layer3.c
team/qwell/moddir_14/formats/mp3/mpg123.h (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/mpg123.h
team/qwell/moddir_14/formats/mp3/mpglib.h (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/mpglib.h
team/qwell/moddir_14/formats/mp3/tabinit.c (props changed)
- copied unchanged from r526, branches/1.4/format_mp3/tabinit.c
team/qwell/moddir_14/res/ (with props)
team/qwell/moddir_14/res/Makefile (with props)
team/qwell/moddir_14/res/res_config_mysql.c (contents, props changed)
- copied, changed from r525, branches/1.4/res_config_mysql.c
Removed:
team/qwell/moddir_14/app_addon_sql_mysql.c
team/qwell/moddir_14/app_saycountpl.c
team/qwell/moddir_14/asterisk-ooh323c/
team/qwell/moddir_14/cdr_addon_mysql.c
team/qwell/moddir_14/format_mp3/
team/qwell/moddir_14/formats/mp3/format_mp3.c
team/qwell/moddir_14/menuselect-tree
team/qwell/moddir_14/res_config_mysql.c
Modified:
team/qwell/moddir_14/ (props changed)
team/qwell/moddir_14/Makefile
team/qwell/moddir_14/Makefile.rules
team/qwell/moddir_14/aclocal.m4
team/qwell/moddir_14/configure
team/qwell/moddir_14/configure.ac
team/qwell/moddir_14/makeopts.in
Propchange: team/qwell/moddir_14/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 13 16:32:44 2008
@@ -8,3 +8,5 @@
.depend
menuselect.makeopts
menuselect.makedeps
+makeopts.embed_rules
+menuselect-tree
Modified: team/qwell/moddir_14/Makefile
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/Makefile?view=diff&rev=527&r1=526&r2=527
==============================================================================
--- team/qwell/moddir_14/Makefile (original)
+++ team/qwell/moddir_14/Makefile Wed Feb 13 16:32:44 2008
@@ -3,7 +3,7 @@
#
# Makefile for Asterisk-addons
#
-# Copyright (C) 1999-2006, Digium, Inc.
+# Copyright (C) 1999-2008, Digium, Inc.
#
# This program is free software, distributed under the terms of
# the GNU General Public License
@@ -11,12 +11,18 @@
export ASTERISK_INCLUDE
export ASTCFLAGS
+export ASTTOPDIR
export CC
export DESTDIR
export INSTALL
export MODULES_DIR
-
-.PHONY: all install samples clean update distclean menuselect chan_ooh323.so format_mp3.so
+export SOLINK
+
+#NOISY_BUILD=yes
+
+empty:=
+space:=$(empty) $(empty)
+ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
# Overwite config files on "make samples"
OVERWRITE:=y
@@ -38,17 +44,11 @@
GLOBAL_MAKEOPTS=$(wildcard /etc/asteriskaddons.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asteriskaddons.makeopts)
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard menuselect.makeopts),)
- include menuselect.makeopts
- include menuselect.makedeps
- endif
-endif
-
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard makeopts),)
+MOD_SUBDIR_CFLAGS=$(ASTERISK_INCLUDE)
+OTHER_SUBDIR_CFLAGS=$(ASTERISK_INCLUDE)
+
+ifneq ($(wildcard makeopts),)
include makeopts
- endif
endif
ifeq ($(OSARCH),SunOS)
@@ -60,9 +60,18 @@
endif
MODULES_DIR=$(ASTLIBDIR)/modules
-MODS:=app_addon_sql_mysql app_saycountpl cdr_addon_mysql chan_ooh323 format_mp3 res_config_mysql
-
-SELECTED_MODS:=$(patsubst %,%.so,$(filter-out $(MENUSELECT_ADDONS),$(MODS)))
+#MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs main res $(LOCAL_MOD_SUBDIRS)
+MOD_SUBDIRS:=channels apps formats cdr res $(LOCAL_MOD_SUBDIRS)
+OTHER_SUBDIRS:=
+SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
+SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
+SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
+SUBDIRS_DIST_CLEAN:=$(SUBDIRS:%=%-dist-clean)
+SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
+MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
+MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
+MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
+MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
ifeq ($(OSARCH),Darwin)
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
@@ -73,19 +82,73 @@
SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
endif
-__all: all
+# comment to print directories during submakes
+#PRINT_DIR=yes
+
+SILENTMAKE:=$(MAKE) --quiet --no-print-directory
+ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
+SUBMAKE:=$(MAKE) --quiet
+else
+SUBMAKE:=$(MAKE) --quiet --no-print-directory
+endif
+
+# $(MAKE) is printed in several places, and we want it to be a
+# fixed size string. Define a variable whose name has also the
+# same size, so we can easily align text.
+ifeq ($(MAKE), gmake)
+ mK="gmake"
+else
+ mK=" make"
+endif
+
+all: _all
@echo " +---- Asterisk-Addons Build Complete ----+"
@echo " + +"
@echo " + Addons has successfully been built . +"
@echo " + If you would like to install it : +"
@echo " + +"
- @echo " + $(MAKE) install +"
+ @echo " + $(mK) install +"
@echo " +---------------------------------------------+"
-all: config.status menuselect.makeopts
- @$(MAKE) _all
-
-_all: $(SELECTED_MODS)
+_all: cleantest makeopts $(SUBDIRS)
+
+makeopts: configure
+ @echo "****"
+ @echo "**** The configure script must be executed before running '$(MAKE)'."
+ @echo "**** Please run \"./configure\"."
+ @echo "****"
+ @exit 1
+
+menuselect.makeopts: menuselect/menuselect menuselect-tree
+ menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
+
+$(MOD_SUBDIRS_EMBED_LDSCRIPT):
+ @echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_EMBED_LDFLAGS):
+ @echo "EMBED_LDFLAGS+="`$(SILENTMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_EMBED_LIBS):
+ @echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_MENUSELECT_TREE):
+ @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
+ @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
+
+makeopts.embed_rules: menuselect.makeopts
+ @echo "Generating embedded module rules ..."
+ @rm -f $@
+ @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
+ @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS)
+ @$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS)
+
+$(SUBDIRS): makeopts.embed_rules
+
+$(MOD_SUBDIRS):
+ @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
+
+$(OTHER_SUBDIRS):
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
config.status: configure
@./configure
@@ -95,14 +158,7 @@
@echo "****"
@exit 1
-install: all
- for x in $(filter-out format_mp3.so chan_ooh323.so,$(SELECTED_MODS)); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
- @if test "x$(findstring format_mp3.so,$(SELECTED_MODS))" != "x" ; then \
- $(MAKE) -C format_mp3 install ; \
- fi
- @if test "x$(findstring chan_ooh323.so,$(SELECTED_MODS))" != "x" ; then \
- $(MAKE) -C asterisk-ooh323c install ; \
- fi
+install: _all $(SUBDIRS_INSTALL)
@echo " +---- Asterisk-Addons Installation Complete ----+"
@echo " + +"
@echo " + Addons has successfully been installed. +"
@@ -113,48 +169,29 @@
@echo " + $(MAKE) samples +"
@echo " +-----------------------------------------------+"
-distclean: clean
- @$(MAKE) -C menuselect distclean
- @if [ -f asterisk-ooh323c/Makefile ] ; then \
- $(MAKE) -C asterisk-ooh323c distclean ; \
- fi
- rm -f build_tools/menuselect-deps
- rm -f menuselect.makeopts makeopts menuselect.makedeps
+cleantest:
+
+$(SUBDIRS_INSTALL):
+ @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) --quiet $(PRINT_DIR) -C $(@:-install=) install
+
+$(SUBDIRS_CLEAN):
+ @$(MAKE) $(PRINT_DIR) -C $(@:-clean=) clean
+
+$(SUBDIRS_DIST_CLEAN):
+ @$(MAKE) $(PRINT_DIR) -C $(@:-dist-clean=) dist-clean
+
+clean: $(SUBDIRS_CLEAN)
+ @$(MAKE) -C menuselect clean
+
+dist-clean: distclean
+
+distclean: $(SUBDIRS_DIST_CLEAN) clean
+ @$(MAKE) -C menuselect dist-clean
+ rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
+ rm -f makeopts.embed_rules
rm -f config.log config.status
rm -rf autom4te.cache
-
-clean:
- rm -f *.so *.o .depend
- rm -f .*.o.d
- @$(MAKE) -C format_mp3 clean
- @$(MAKE) -C menuselect clean
- @if [ -f asterisk-ooh323c/Makefile ] ; then \
- $(MAKE) -C asterisk-ooh323c clean ; \
- fi
-
-ifneq ($(wildcard .*.d),)
- include .*.d
-endif
-
-ASTCFLAGS+=$(ASTERISK_INCLUDE)
-
-cdr_addon_mysql.so: cdr_addon_mysql.o
- $(CC) $(SOLINK) -o $@ $< $(MYSQLCLIENT_LIB)
-
-res_config_mysql.so: res_config_mysql.o
- $(CC) $(SOLINK) -o $@ $< $(MYSQLCLIENT_LIB)
-
-app_addon_sql_mysql.so: app_addon_sql_mysql.o
- $(CC) $(SOLINK) -o $@ $< $(MYSQLCLIENT_LIB)
-
-chan_ooh323.so:
- @if [ ! -f asterisk-ooh323c/Makefile ] ; then \
- cd asterisk-ooh323c && ./configure ; \
- fi
- @$(MAKE) -C asterisk-ooh323c
-
-format_mp3.so:
- @INCLUDE="$(ASTCFLAGS)" $(MAKE) -C format_mp3 all CC="$(CC)"
+ rm -f build_tools/menuselect-deps
samples:
mkdir -p $(DESTDIR)$(ASTETCDIR)
@@ -182,9 +219,6 @@
echo "Not under version control"; \
fi
-menuselect.makeopts menuselect.makedeps: menuselect/menuselect menuselect-tree
- @menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
-
menuconfig: menuselect
gmenuconfig: gmenuselect
@@ -195,10 +229,25 @@
gmenuselect: menuselect/gmenuselect menuselect-tree
- at menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
- @CC="$(HOST_CC)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
-
-menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
- @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
-
-include Makefile.rules
+# options for make in menuselect/
+MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+
+menuselect/menuselect: menuselect/makeopts
+ $(MAKE_MENUSELECT)
+
+menuselect/gmenuselect: menuselect/makeopts
+ $(MAKE_MENUSELECT) gmenuselect
+
+menuselect/makeopts:
+ $(MAKE_MENUSELECT) makeopts
+
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) configure
+ @echo "Generating input for menuselect ..."
+ @echo "<?xml version=\"1.0\"?>" > $@
+ @echo >> $@
+ @echo "<menu name=\"Asterisk-addons Module Selection\">" >> $@
+ @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
+ @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
+ @echo "</menu>" >> $@
+
+.PHONY: menuselect clean dist-clean distclean all cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)
Added: team/qwell/moddir_14/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/Makefile.moddir_rules?view=auto&rev=527
==============================================================================
--- team/qwell/moddir_14/Makefile.moddir_rules (added)
+++ team/qwell/moddir_14/Makefile.moddir_rules Wed Feb 13 16:32:44 2008
@@ -1,0 +1,118 @@
+#
+# Asterisk -- A telephony toolkit for Linux.
+#
+# Makefile rules for subdirectories containing modules
+#
+# Copyright (C) 2006, Digium, Inc.
+#
+# Kevin P. Fleming <kpfleming at digium.com>
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License
+#
+
+ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)
+ ifeq ($(findstring astmm.h,$(ASTCFLAGS)),)
+ ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/astmm.h
+ endif
+endif
+
+ifeq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
+ ASTCFLAGS+=${GC_CFLAGS}
+endif
+
+ifneq ($(findstring STATIC_BUILD,$(MENUSELECT_CFLAGS)),)
+ STATIC_BUILD=-static
+endif
+
+include $(ASTTOPDIR)/Makefile.rules
+
+comma:=,
+
+$(addsuffix .o,$(C_MODS)): ASTCFLAGS+=-DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
+$(addsuffix .oo,$(CC_MODS)): ASTCFLAGS+=-DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
+
+$(LOADABLE_MODS:%=%.so): ASTCFLAGS+=-fPIC
+$(LOADABLE_MODS:%=%.so): LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LIB))
+$(LOADABLE_MODS:%=%.so): ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS))
+
+$(addsuffix .so,$(filter $(LOADABLE_MODS),$(C_MODS))): %.so: %.o
+$(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo
+
+modules.link: $(addsuffix .o,$(filter $(EMBEDDED_MODS),$(C_MODS)))
+modules.link: $(addsuffix .oo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
+
+.PHONY: clean uninstall _all moduleinfo makeopts
+
+ifneq ($(LOADABLE_MODS),)
+_all: $(LOADABLE_MODS:%=%.so)
+endif
+
+ifneq ($(EMBEDDED_MODS),)
+_all: modules.link
+__embed_ldscript:
+ @echo "../$(SUBDIR)/modules.link"
+__embed_ldflags:
+ @echo "$(foreach mod,$(filter $(EMBEDDED_MODS),$(C_MODS)),$(foreach dep,$(MENUSELECT_DEPENDS_$(mod)),$(dep)_LDFLAGS))"
+ @echo "$(foreach mod,$(filter $(EMBEDDED_MODS),$(CC_MODS)),$(foreach dep,$(MENUSELECT_DEPENDS_$(mod)),$(dep)_LDFLAGS))"
+__embed_libs:
+ @echo "$(foreach mod,$(filter $(EMBEDDED_MODS),$(C_MODS)),$(foreach dep,$(MENUSELECT_DEPENDS_$(mod)),$(dep)_LIB))"
+ @echo "$(foreach mod,$(filter $(EMBEDDED_MODS),$(CC_MODS)),$(foreach dep,$(MENUSELECT_DEPENDS_$(mod)),$(dep)_LIB))"
+else
+__embed_ldscript:
+__embed_ldflags:
+__embed_libs:
+endif
+
+modules.link:
+ @rm -f $@
+ @for file in $(patsubst %,$(SUBDIR)/%,$(filter %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
+ @for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.o,$^)); do echo "INPUT (../$${file})" >> $@; done
+
+clean::
+ rm -f *.so *.o *.oo *.s *.i
+ rm -f .*.o.d .*.oo.d
+ rm -f modules.link
+
+install:: all
+ for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+
+uninstall::
+
+dist-clean::
+ rm -f .*.moduleinfo .moduleinfo
+ rm -f .*.makeopts .makeopts
+
+.%.moduleinfo: %.c
+ @echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@
+ $(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+ echo "</member>" >> $@
+
+.%.moduleinfo: %.cc
+ @echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.oo $(SUBDIR)/$*.so\">" > $@
+ $(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+ echo "</member>" >> $@
+
+.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+ @echo "<category name=\"MENUSELECT_$(MENUSELECT_CATEGORY)\" displayname=\"$(MENUSELECT_DESCRIPTION)\" remove_on_change=\"$(SUBDIR)/modules.link\">" > $@
+ @cat $^ >> $@
+ @echo "</category>" >> $@
+
+moduleinfo: .moduleinfo
+ @cat $<
+
+.%.makeopts: %.c
+ @$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.%.makeopts: %.cc
+ @$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.makeopts:: $(addsuffix .makeopts,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+ @cat $^ > $@
+
+makeopts: .makeopts
+ @cat $<
+
+ifneq ($(wildcard .*.d),)
+ include .*.d
+endif
Propchange: team/qwell/moddir_14/Makefile.moddir_rules
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/Makefile.moddir_rules
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/Makefile.moddir_rules
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/qwell/moddir_14/Makefile.rules
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/Makefile.rules?view=diff&rev=527&r1=526&r2=527
==============================================================================
--- team/qwell/moddir_14/Makefile.rules (original)
+++ team/qwell/moddir_14/Makefile.rules Wed Feb 13 16:32:44 2008
@@ -42,14 +42,6 @@
$(ECHO_PREFIX) echo " [CC] $< -> $@"
$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-%.o: %.i
- $(ECHO_PREFIX) echo " [CC] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-
-%.i: %.c
- $(ECHO_PREFIX) echo " [CC] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -E $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
-
%.o: %.s
$(ECHO_PREFIX) echo " [AS] $< -> $@"
$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
@@ -74,18 +66,6 @@
$(ECHO_PREFIX) echo " [LDXX] $^ -> $@"
$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
-%.eo: %.o
- $(ECHO_PREFIX) echo " [EMBED] $< -> $@"
- $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_eo_script $* > .$@.ld
- $(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<
- $(CMD_PREFIX) rm -f .$@.ld
-
-%.eoo: %.o
- $(ECHO_PREFIX) echo " [EMBED] $< -> $@"
- $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_eo_script $* > .$@.ld
- $(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<
- $(CMD_PREFIX) rm -f .$@.ld
-
%: %.o
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)
Modified: team/qwell/moddir_14/aclocal.m4
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/aclocal.m4?view=diff&rev=527&r1=526&r2=527
==============================================================================
--- team/qwell/moddir_14/aclocal.m4 (original)
+++ team/qwell/moddir_14/aclocal.m4 Wed Feb 13 16:32:44 2008
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Propchange: team/qwell/moddir_14/apps/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 13 16:32:44 2008
@@ -1,0 +1,8 @@
+*.a
+*.d
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
Added: team/qwell/moddir_14/apps/Makefile
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/apps/Makefile?view=auto&rev=527
==============================================================================
--- team/qwell/moddir_14/apps/Makefile (added)
+++ team/qwell/moddir_14/apps/Makefile Wed Feb 13 16:32:44 2008
@@ -1,0 +1,32 @@
+#
+# Asterisk -- A telephony toolkit for Linux.
+#
+# Makefile for PBX applications
+#
+# Copyright (C) 1999-2006, Digium, Inc.
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License
+#
+
+-include ../menuselect.makeopts ../menuselect.makedeps
+
+MENUSELECT_CATEGORY=APPS
+MENUSELECT_DESCRIPTION=Applications
+
+ALL_C_MODS:=$(patsubst %.c,%,$(wildcard app_*.c))
+ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard app_*.cc))
+
+C_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_C_MODS))
+CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_CC_MODS))
+
+LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
+
+ifneq ($(findstring apps,$(MENUSELECT_EMBED)),)
+ EMBEDDED_MODS:=$(LOADABLE_MODS)
+ LOADABLE_MODS:=
+endif
+
+all: _all
+
+include $(ASTTOPDIR)/Makefile.moddir_rules
Propchange: team/qwell/moddir_14/apps/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/apps/Makefile
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/apps/Makefile
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: team/qwell/moddir_14/apps/app_addon_sql_mysql.c (from r525, branches/1.4/app_addon_sql_mysql.c)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/apps/app_addon_sql_mysql.c?view=diff&rev=527&p1=branches/1.4/app_addon_sql_mysql.c&r1=525&p2=team/qwell/moddir_14/apps/app_addon_sql_mysql.c&r2=527
==============================================================================
--- branches/1.4/app_addon_sql_mysql.c (original)
+++ team/qwell/moddir_14/apps/app_addon_sql_mysql.c Wed Feb 13 16:32:44 2008
@@ -32,8 +32,6 @@
#include <asterisk/linkedlists.h>
#include <asterisk/chanvars.h>
#include <asterisk/lock.h>
-
-#define AST_MODULE "app_addon_sql_mysql"
#define EXTRA_LOG 0
Propchange: team/qwell/moddir_14/apps/app_addon_sql_mysql.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/apps/app_addon_sql_mysql.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/apps/app_addon_sql_mysql.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: team/qwell/moddir_14/apps/app_saycountpl.c (from r525, branches/1.4/app_saycountpl.c)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/apps/app_saycountpl.c?view=diff&rev=527&p1=branches/1.4/app_saycountpl.c&r1=525&p2=team/qwell/moddir_14/apps/app_saycountpl.c&r2=527
==============================================================================
--- branches/1.4/app_saycountpl.c (original)
+++ team/qwell/moddir_14/apps/app_saycountpl.c Wed Feb 13 16:32:44 2008
@@ -18,8 +18,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-
-#define AST_MODULE "ast_saycountpl"
static char *app = "SayCountPL";
Propchange: team/qwell/moddir_14/apps/app_saycountpl.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/apps/app_saycountpl.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/apps/app_saycountpl.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: team/qwell/moddir_14/build_tools/get_makeopts
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/build_tools/get_makeopts?view=auto&rev=527
==============================================================================
--- team/qwell/moddir_14/build_tools/get_makeopts (added)
+++ team/qwell/moddir_14/build_tools/get_makeopts Wed Feb 13 16:32:44 2008
@@ -1,0 +1,3 @@
+/\/\*\*\* MAKEOPTS/ {printit=1; next}
+/\*\*\*\// {if (printit) exit}
+// {if (printit) print}
Propchange: team/qwell/moddir_14/build_tools/get_makeopts
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/build_tools/get_makeopts
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/build_tools/get_makeopts
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: team/qwell/moddir_14/build_tools/get_moduleinfo
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/build_tools/get_moduleinfo?view=auto&rev=527
==============================================================================
--- team/qwell/moddir_14/build_tools/get_moduleinfo (added)
+++ team/qwell/moddir_14/build_tools/get_moduleinfo Wed Feb 13 16:32:44 2008
@@ -1,0 +1,3 @@
+/\/\*\*\* MODULEINFO/ {printit=1; next}
+/\*\*\*\// {if (printit) exit}
+// {if (printit) print}
Propchange: team/qwell/moddir_14/build_tools/get_moduleinfo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/build_tools/get_moduleinfo
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/build_tools/get_moduleinfo
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: team/qwell/moddir_14/cdr/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 13 16:32:44 2008
@@ -1,0 +1,8 @@
+*.a
+*.d
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
Added: team/qwell/moddir_14/cdr/Makefile
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/cdr/Makefile?view=auto&rev=527
==============================================================================
--- team/qwell/moddir_14/cdr/Makefile (added)
+++ team/qwell/moddir_14/cdr/Makefile Wed Feb 13 16:32:44 2008
@@ -1,0 +1,32 @@
+#
+# Asterisk -- A telephony toolkit for Linux.
+#
+# Makefile for CDR backends
+#
+# Copyright (C) 1999-2006, Digium, Inc.
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License
+#
+
+-include ../menuselect.makeopts ../menuselect.makedeps
+
+MENUSELECT_CATEGORY=CDR
+MENUSELECT_DESCRIPTION=Call Detail Recording
+
+ALL_C_MODS:=$(patsubst %.c,%,$(wildcard cdr_*.c))
+ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard cdr_*.cc))
+
+C_MODS:=$(filter-out $(MENUSELECT_CDR),$(ALL_C_MODS))
+CC_MODS:=$(filter-out $(MENUSELECT_CDR),$(ALL_CC_MODS))
+
+LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
+
+ifneq ($(findstring cdr,$(MENUSELECT_EMBED)),)
+ EMBEDDED_MODS:=$(LOADABLE_MODS)
+ LOADABLE_MODS:=
+endif
+
+all: _all
+
+include $(ASTTOPDIR)/Makefile.moddir_rules
Propchange: team/qwell/moddir_14/cdr/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/cdr/Makefile
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/cdr/Makefile
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: team/qwell/moddir_14/cdr/cdr_addon_mysql.c (from r525, branches/1.4/cdr_addon_mysql.c)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/cdr/cdr_addon_mysql.c?view=diff&rev=527&p1=branches/1.4/cdr_addon_mysql.c&r1=525&p2=team/qwell/moddir_14/cdr/cdr_addon_mysql.c&r2=527
==============================================================================
--- branches/1.4/cdr_addon_mysql.c (original)
+++ team/qwell/moddir_14/cdr/cdr_addon_mysql.c Wed Feb 13 16:32:44 2008
@@ -43,8 +43,6 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
-
-#define AST_MODULE "cdr_addon_mysql"
#define DATE_FORMAT "%Y-%m-%d %T"
Propchange: team/qwell/moddir_14/cdr/cdr_addon_mysql.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/cdr/cdr_addon_mysql.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/cdr/cdr_addon_mysql.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: team/qwell/moddir_14/channels/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 13 16:32:44 2008
@@ -1,0 +1,8 @@
+*.a
+*.d
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
Added: team/qwell/moddir_14/channels/Makefile
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/channels/Makefile?view=auto&rev=527
==============================================================================
--- team/qwell/moddir_14/channels/Makefile (added)
+++ team/qwell/moddir_14/channels/Makefile Wed Feb 13 16:32:44 2008
@@ -1,0 +1,52 @@
+#
+# Asterisk -- A telephony toolkit for Linux.
+#
+# Makefile for channel drivers
+#
+# Copyright (C) 1999-2006, Digium, Inc.
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License
+#
+
+-include ../menuselect.makeopts ../menuselect.makedeps
+
+MENUSELECT_CATEGORY=CHANNELS
+MENUSELECT_DESCRIPTION=Channel Drivers
+
+ALL_C_MODS:=$(patsubst %.c,%,$(wildcard chan_*.c))
+ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard chan_*.cc))
+
+C_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(ALL_C_MODS))
+CC_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(ALL_CC_MODS))
+
+LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
+
+ifneq ($(findstring channels,$(MENUSELECT_EMBED)),)
+ EMBEDDED_MODS:=$(LOADABLE_MODS)
+ LOADABLE_MODS:=
+endif
+
+H323OBJS=ooCmdChannel.o ooLogChan.o ooUtils.o ooGkClient.o context.o \
+ ooDateTime.o decode.o dlist.o encode.o errmgmt.o \
+ memheap.o ootrace.o oochannels.o ooh245.o ooports.o \
+ ooq931.o ooCapability.o ooSocket.o perutil.o eventHandler.o \
+ ooCalls.o ooStackCmds.o ooh323.o ooh323ep.o printHandler.o \
+ rtctype.o ooTimer.o h323/H235-SECURITY-MESSAGESDec.o \
+ h323/H235-SECURITY-MESSAGESEnc.o h323/H323-MESSAGES.o h323/H323-MESSAGESDec.o \
+ h323/H323-MESSAGESEnc.o h323/MULTIMEDIA-SYSTEM-CONTROL.o \
+ h323/MULTIMEDIA-SYSTEM-CONTROLDec.o h323/MULTIMEDIA-SYSTEM-CONTROLEnc.o
+
+H323CFLAGS=-Iooh323c/src -Iooh323c/src/h323
+
+all: _all
+
+include $(ASTTOPDIR)/Makefile.moddir_rules
+
+clean::
+ rm -f $(addprefix ooh323c/src/,$(H323OBJS))
+
+chan_ooh323.o: ASTCFLAGS+=$(H323CFLAGS)
+
+$(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): ASTCFLAGS+=$(H323CFLAGS)
+$(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): $(addprefix ooh323c/src/,$(H323OBJS)) chan_ooh323.o ooh323cDriver.o
Propchange: team/qwell/moddir_14/channels/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/channels/Makefile
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/channels/Makefile
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: team/qwell/moddir_14/channels/chan_ooh323.c (from r526, team/qwell/moddir_14/asterisk-ooh323c/src/chan_h323.c)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/channels/chan_ooh323.c?view=diff&rev=527&p1=team/qwell/moddir_14/asterisk-ooh323c/src/chan_h323.c&r1=526&p2=team/qwell/moddir_14/channels/chan_ooh323.c&r2=527
==============================================================================
--- team/qwell/moddir_14/asterisk-ooh323c/src/chan_h323.c (original)
+++ team/qwell/moddir_14/channels/chan_ooh323.c Wed Feb 13 16:32:44 2008
@@ -15,9 +15,7 @@
*****************************************************************************/
-#include "chan_h323.h"
-
-#define AST_MODULE "chan_ooh323"
+#include "chan_ooh323.h"
/* Defaults */
#define DEFAULT_CONTEXT "default"
Propchange: team/qwell/moddir_14/channels/chan_ooh323.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/channels/chan_ooh323.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/channels/chan_ooh323.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: team/qwell/moddir_14/channels/chan_ooh323.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/channels/chan_ooh323.h
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/channels/chan_ooh323.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: team/qwell/moddir_14/channels/ooh323cDriver.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/channels/ooh323cDriver.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/channels/ooh323cDriver.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: team/qwell/moddir_14/channels/ooh323cDriver.h (from r525, branches/1.4/asterisk-ooh323c/src/ooh323cDriver.h)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddir_14/channels/ooh323cDriver.h?view=diff&rev=527&p1=branches/1.4/asterisk-ooh323c/src/ooh323cDriver.h&r1=525&p2=team/qwell/moddir_14/channels/ooh323cDriver.h&r2=527
==============================================================================
--- branches/1.4/asterisk-ooh323c/src/ooh323cDriver.h (original)
+++ team/qwell/moddir_14/channels/ooh323cDriver.h Wed Feb 13 16:32:44 2008
@@ -15,7 +15,7 @@
*****************************************************************************/
#ifndef _OO_H323CDRIVER_H_
#define __OO_H323DRIVER_H_
-#include "chan_h323.h"
+#include "chan_ooh323.h"
#include "ootypes.h"
#include "ooh323ep.h"
#include "oochannels.h"
Propchange: team/qwell/moddir_14/channels/ooh323cDriver.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/channels/ooh323cDriver.h
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddir_14/channels/ooh323cDriver.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: team/qwell/moddir_14/configs/ooh323.conf.sample
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddir_14/configs/ooh323.conf.sample
------------------------------------------------------------------------------
[... 433 lines stripped ...]
More information about the asterisk-addons-commits
mailing list