[asterisk-addons-commits] qwell: branch qwell/moddirmagic r511 - in /team/qwell/moddirmagic: ./ apps/ b...
SVN commits to the Asterisk addons project
asterisk-addons-commits at lists.digium.com
Wed Feb 6 15:37:18 CST 2008
Author: qwell
Date: Wed Feb 6 15:37:18 2008
New Revision: 511
URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=511
Log:
Well, it builds...maybe?
TODO: Modify format_mp3 and chan_ooh323 structure to build/install.
Added:
team/qwell/moddirmagic/Makefile.moddir_rules (with props)
team/qwell/moddirmagic/apps/ (with props)
team/qwell/moddirmagic/apps/Makefile (with props)
team/qwell/moddirmagic/apps/app_addon_sql_mysql.c (contents, props changed)
- copied, changed from r507, trunk/app_addon_sql_mysql.c
team/qwell/moddirmagic/apps/app_fax.c
- copied, changed from r507, trunk/app_fax.c
team/qwell/moddirmagic/apps/app_saycountpl.c (contents, props changed)
- copied, changed from r507, trunk/app_saycountpl.c
team/qwell/moddirmagic/build_tools/get_makeopts (with props)
team/qwell/moddirmagic/build_tools/get_moduleinfo (with props)
team/qwell/moddirmagic/cdr/ (with props)
team/qwell/moddirmagic/cdr/Makefile (with props)
team/qwell/moddirmagic/cdr/cdr_addon_mysql.c (contents, props changed)
- copied, changed from r507, trunk/cdr_addon_mysql.c
team/qwell/moddirmagic/channels/ (with props)
team/qwell/moddirmagic/channels/Makefile (with props)
team/qwell/moddirmagic/channels/chan_mobile.c
- copied, changed from r507, trunk/chan_mobile.c
team/qwell/moddirmagic/formats/ (with props)
team/qwell/moddirmagic/formats/Makefile (with props)
team/qwell/moddirmagic/formats/format_mp3/
- copied from r507, trunk/format_mp3/
team/qwell/moddirmagic/formats/format_mp3/MPGLIB_README (props changed)
- copied unchanged from r510, trunk/format_mp3/MPGLIB_README
team/qwell/moddirmagic/formats/format_mp3/MPGLIB_TODO (props changed)
- copied unchanged from r510, trunk/format_mp3/MPGLIB_TODO
team/qwell/moddirmagic/formats/format_mp3/Makefile (props changed)
- copied unchanged from r510, trunk/format_mp3/Makefile
team/qwell/moddirmagic/formats/format_mp3/README (props changed)
- copied unchanged from r510, trunk/format_mp3/README
team/qwell/moddirmagic/formats/format_mp3/common.c (props changed)
- copied unchanged from r510, trunk/format_mp3/common.c
team/qwell/moddirmagic/formats/format_mp3/dct64_i386.c (props changed)
- copied unchanged from r510, trunk/format_mp3/dct64_i386.c
team/qwell/moddirmagic/formats/format_mp3/decode_i386.c (props changed)
- copied unchanged from r510, trunk/format_mp3/decode_i386.c
team/qwell/moddirmagic/formats/format_mp3/decode_ntom.c (props changed)
- copied unchanged from r510, trunk/format_mp3/decode_ntom.c
team/qwell/moddirmagic/formats/format_mp3/format_mp3.c (props changed)
- copied unchanged from r510, trunk/format_mp3/format_mp3.c
team/qwell/moddirmagic/formats/format_mp3/huffman.h (props changed)
- copied unchanged from r510, trunk/format_mp3/huffman.h
team/qwell/moddirmagic/formats/format_mp3/interface.c (props changed)
- copied unchanged from r510, trunk/format_mp3/interface.c
team/qwell/moddirmagic/formats/format_mp3/layer3.c (props changed)
- copied unchanged from r510, trunk/format_mp3/layer3.c
team/qwell/moddirmagic/formats/format_mp3/mpg123.h (props changed)
- copied unchanged from r510, trunk/format_mp3/mpg123.h
team/qwell/moddirmagic/formats/format_mp3/mpglib.h (props changed)
- copied unchanged from r510, trunk/format_mp3/mpglib.h
team/qwell/moddirmagic/formats/format_mp3/tabinit.c (props changed)
- copied unchanged from r510, trunk/format_mp3/tabinit.c
team/qwell/moddirmagic/res/ (with props)
team/qwell/moddirmagic/res/Makefile (with props)
team/qwell/moddirmagic/res/res_config_mysql.c (contents, props changed)
- copied, changed from r507, trunk/res_config_mysql.c
Removed:
team/qwell/moddirmagic/app_addon_sql_mysql.c
team/qwell/moddirmagic/app_fax.c
team/qwell/moddirmagic/app_saycountpl.c
team/qwell/moddirmagic/cdr_addon_mysql.c
team/qwell/moddirmagic/chan_mobile.c
team/qwell/moddirmagic/format_mp3/
team/qwell/moddirmagic/res_config_mysql.c
Modified:
team/qwell/moddirmagic/ (props changed)
team/qwell/moddirmagic/Makefile
team/qwell/moddirmagic/Makefile.rules
team/qwell/moddirmagic/configure
team/qwell/moddirmagic/configure.ac
team/qwell/moddirmagic/makeopts.in
team/qwell/moddirmagic/menuselect-tree
Propchange: team/qwell/moddirmagic/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 6 15:37:18 2008
@@ -9,3 +9,4 @@
menuselect.makeopts
menuselect.makedeps
update.log
+makeopts.embed_rules
Modified: team/qwell/moddirmagic/Makefile
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/Makefile?view=diff&rev=511&r1=510&r2=511
==============================================================================
--- team/qwell/moddirmagic/Makefile (original)
+++ team/qwell/moddirmagic/Makefile Wed Feb 6 15:37:18 2008
@@ -11,20 +11,27 @@
export ASTERISK_INCLUDE
export ASTCFLAGS
+export ASTTOPDIR
export CC
export DESTDIR
export INSTALL
export MODULES_DIR
export NOISY_BUILD
-
-.PHONY: all install samples clean update distclean menuselect chan_ooh323.so format_mp3.so
+export SOLINK
+
+.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)
+#.PHONY: all install samples clean update distclean dist-clean menuselect chan_ooh323.so format_mp3.so
+
+ASTCFLAGS+=-fPIC
+
+#NOISY_BUILD=yes
+
+empty:=
+space:=$(empty) $(empty)
+ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
# Overwite config files on "make samples"
OVERWRITE:=y
-
-ASTCFLAGS+=-fPIC
-
-#NOISY_BUILD=yes
ifeq ($(AST_DEVMODE),yes)
ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT)
@@ -39,17 +46,15 @@
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),)
+#ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
+# ifneq ($(wildcard menuselect.makeopts),)
+# include menuselect.makeopts
+# include menuselect.makedeps
+# endif
+#endif
+
+ifneq ($(wildcard makeopts),)
include makeopts
- endif
endif
ifeq ($(OSARCH),SunOS)
@@ -61,9 +66,19 @@
endif
MODULES_DIR=$(ASTLIBDIR)/modules
-MODS:=app_addon_sql_mysql app_saycountpl cdr_addon_mysql chan_ooh323 format_mp3 res_config_mysql chan_mobile app_fax
-
-SELECTED_MODS:=$(patsubst %,%.so,$(filter-out $(MENUSELECT_ADDONS),$(MODS)))
+#MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs tests main res $(LOCAL_MOD_SUBDIRS)
+#MOD_SUBDIRS:=channels apps formats cdr res $(LOCAL_MOD_SUBDIRS)
+MOD_SUBDIRS:=channels apps 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
@@ -74,19 +89,77 @@
SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
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 " +---------------------------------------------+"
-
-all: config.status menuselect.makeopts
- @$(MAKE) _all
-
-_all: $(SELECTED_MODS)
+# comment to print directories during submakes
+#PRINT_DIR=yes
+
+SILENTMAKE:=$(MAKE) --quiet --no-print-directory
+#SILENTMAKE:=$(MAKE)
+ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
+SUBMAKE:=$(MAKE) --quiet
+#SUBMAKE:=$(MAKE)
+else
+SUBMAKE:=$(MAKE) --quiet --no-print-directory
+#SUBMAKE:=$(MAKE)
+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 " + $(mK) install +"
+ @echo " +-------------------------------------------+"
+
+_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): main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
+$(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
@@ -96,14 +169,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. +"
@@ -114,54 +180,45 @@
@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
- 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
+cleantest:
+
+$(SUBDIRS_INSTALL):
+ @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) --quiet $(PRINT_DIR) -C $(@:-install=) install
+
+$(SUBDIRS_UNINSTALL):
+ @$(MAKE) $(PRINT_DIR) -C $(@:-uninstall=) uninstall
+
+$(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
@if [ -f asterisk-ooh323c/Makefile ] ; then \
$(MAKE) -C asterisk-ooh323c clean ; \
fi
-ifneq ($(wildcard .*.d),)
- include .*.d
-endif
-
-ASTCFLAGS+=$(ASTERISK_INCLUDE)
-
-app_fax.so: app_fax.o
- $(CC) $(SOLINK) -o $@ $< $(SPANDSP_LIB)
-
-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_mobile.so: chan_mobile.o
- $(CC) $(SOLINK) -o $@ $< $(BLUETOOTH_LIB)
+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
+ rm -f build_tools/menuselect-deps
+
+ @if [ -f asterisk-ooh323c/Makefile ] ; then \
+ $(MAKE) -C asterisk-ooh323c distclean ; \
+ fi
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)"
samples:
mkdir -p $(DESTDIR)$(ASTETCDIR)
@@ -198,15 +255,33 @@
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
menuselect: menuselect/menuselect menuselect-tree
- at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h config.status
- @$(MAKE) -C menuselect
-
-include Makefile.rules
+gmenuselect: menuselect/gmenuselect menuselect-tree
+ - at menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+
+# 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 Module and Build Option 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>" >> $@
Added: team/qwell/moddirmagic/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/Makefile.moddir_rules?view=auto&rev=511
==============================================================================
--- team/qwell/moddirmagic/Makefile.moddir_rules (added)
+++ team/qwell/moddirmagic/Makefile.moddir_rules Wed Feb 6 15:37:18 2008
@@ -1,0 +1,166 @@
+#
+# 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
+#
+
+# Makefile rules for building modules.
+
+# In most cases, we set target-specific variables for certain targets
+# (remember that they apply recursively to prerequisites).
+# Also note that we can only set one variable per rule, so we have to
+# repeat the left hand side to set multiple variables.
+
+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
+
+# If MODULE_PREFIX is defined, use it to run the standard functions to set
+# C_MODS, CC_MODS, LOADABLE_MODS and EMBEDDED_MODS.
+# Each word of MODULE_PREFIX is a prefix for filenames that we consider
+# valid C or CC modules (eg. app, func ...). Note that the underscore
+# is added here, and does not need to be in MODULE_PREFIX
+#
+# Use MODULE_EXCLUDE to specify additional modules to exclude.
+
+ifneq ($(MODULE_PREFIX),)
+ ALL_C_MODS:=
+ ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c)))
+ ALL_CC_MODS:=
+ ALL_CC_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.cc,%,$(wildcard $(p)_*.cc)))
+
+ C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
+ CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
+
+ # and store in the list of embedded or loadable modules
+ ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
+ EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
+ else
+ LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
+ endif
+endif
+
+# Both C++ and C++ sources need their module name in AST_MODULE
+# We also pass whatever _INCLUDE list is generated by menuselect
+# (they are stored in file 'makeopts')
+
+$(addsuffix .oo,$(CC_MODS)) $(addsuffix .o,$(C_MODS)): \
+ ASTCFLAGS+= -DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
+
+ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
+ # don't define -fPIC on mingw32 and cygwin, it is the default
+ $(LOADABLE_MODS:%=%.so): ASTCFLAGS+=-fPIC
+endif
+
+# For loadable modules, pass _LIB and _LDFLAGS from menuselect.
+$(LOADABLE_MODS:%=%.so): LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LIB))
+$(LOADABLE_MODS:%=%.so): ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS))
+
+$(EMBEDDED_MODS:%=%.o): ASTCFLAGS+=-DEMBEDDED_MODULE=$*
+
+$(addsuffix .so,$(filter $(LOADABLE_MODS),$(C_MODS))): %.so: %.o
+$(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo
+
+modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS)))
+
+.PHONY: clean uninstall _all moduleinfo makeopts
+
+ifneq ($(LOADABLE_MODS),)
+_all: $(LOADABLE_MODS:%=%.so)
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+ # linker options and extra libraries for cygwin
+ SOLINK=-Wl,--out-implib=lib$@.a -shared
+ LIBS+=-L$(ASTTOPDIR)/main -lasterisk -L$(ASTTOPDIR)/res $($@_LIBS)
+ # additional libraries in res/
+endif
+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 %.eo,$^)); do echo "INPUT (../$${file})" >> $@; done
+ @for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.eo,$^)); do echo "INPUT (../$${file})" >> $@; done
+
+clean::
+ rm -f *.so *.o *.oo *.eo
+ rm -f .*.o.d .*.oo.d
+ rm -f *.s *.i
+ rm -f modules.link
+
+install:: all
+ @echo "Installing modules from `basename $(CURDIR)`..."
+ @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/moddirmagic/Makefile.moddir_rules
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddirmagic/Makefile.moddir_rules
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddirmagic/Makefile.moddir_rules
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/qwell/moddirmagic/Makefile.rules
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/Makefile.rules?view=diff&rev=511&r1=510&r2=511
==============================================================================
--- team/qwell/moddirmagic/Makefile.rules (original)
+++ team/qwell/moddirmagic/Makefile.rules Wed Feb 6 15:37:18 2008
@@ -11,6 +11,7 @@
# the GNU General Public License
#
+# Rules for various build phases.
# Each command is preceded by a short comment on what to do.
# Prefixing one or the other with @\# or @ or nothing makes the desired
# behaviour. ECHO_PREFIX prefixes the comment, CMD_PREFIX prefixes the command.
@@ -19,44 +20,50 @@
.PHONY: dist-clean
+# extra cflags to build dependencies. Recursively expanded.
+MAKE_DEPS= -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+
ifeq ($(NOISY_BUILD),)
- ECHO_PREFIX=@
- CMD_PREFIX=@
+ ECHO_PREFIX=@
+ CMD_PREFIX=@
else
- ECHO_PREFIX=@\#
- CMD_PREFIX=
+ ECHO_PREFIX=@\#
+ CMD_PREFIX=
endif
ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
-# More GSM codec optimization
-# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-# which support MMX instructions. This should be newer pentiums,
-# ppro's, etc, as well as the AMD K6 and K7.
-#K6OPT=-DK6OPT
+ # More GSM codec optimization
+ # Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+ # which support MMX instructions. This should be newer pentiums,
+ # ppro's, etc, as well as the AMD K6 and K7.
+ #K6OPT=-DK6OPT
-OPTIMIZE?=-O6
-ASTCFLAGS+=$(OPTIMIZE)
+ OPTIMIZE?=-O6
+ ASTCFLAGS+=$(OPTIMIZE)
endif
+ASTCFLAGS+=$(ASTERISK_INCLUDE)
+
+# build rules for various targets
%.o: %.c
$(ECHO_PREFIX) echo " [CC] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
%.o: %.i
- $(ECHO_PREFIX) echo " [CC] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+ $(ECHO_PREFIX) echo " [CCi] $< -> $@"
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
%.i: %.c
- $(ECHO_PREFIX) echo " [CC] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -E $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+ $(ECHO_PREFIX) echo " [CPP] $< -> $@"
+ $(CMD_PREFIX) $(CC) -o $@ -E $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
%.o: %.s
$(ECHO_PREFIX) echo " [AS] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
%.oo: %.cc
$(ECHO_PREFIX) echo " [CXX] $< -> $@"
- $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) $(MAKE_DEPS)
%.c: %.y
$(ECHO_PREFIX) echo " [BISON] $< -> $@"
@@ -80,7 +87,7 @@
$(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<
$(CMD_PREFIX) rm -f .$@.ld
-%.eoo: %.o
+%.eo: %.oo
$(ECHO_PREFIX) echo " [EMBED] $< -> $@"
$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_eo_script $* > .$@.ld
$(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<
Propchange: team/qwell/moddirmagic/apps/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 6 15:37:18 2008
@@ -1,0 +1,10 @@
+*.a
+*.d
+*.eo
+*.eoo
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
Added: team/qwell/moddirmagic/apps/Makefile
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/apps/Makefile?view=auto&rev=511
==============================================================================
--- team/qwell/moddirmagic/apps/Makefile (added)
+++ team/qwell/moddirmagic/apps/Makefile Wed Feb 6 15:37:18 2008
@@ -1,0 +1,20 @@
+#
+# 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 $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
+
+MODULE_PREFIX=app
+MENUSELECT_CATEGORY=APPS
+MENUSELECT_DESCRIPTION=Applications
+
+all: _all
+
+include $(ASTTOPDIR)/Makefile.moddir_rules
Propchange: team/qwell/moddirmagic/apps/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddirmagic/apps/Makefile
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddirmagic/apps/Makefile
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: team/qwell/moddirmagic/apps/app_addon_sql_mysql.c (from r507, trunk/app_addon_sql_mysql.c)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/apps/app_addon_sql_mysql.c?view=diff&rev=511&p1=trunk/app_addon_sql_mysql.c&r1=507&p2=team/qwell/moddirmagic/apps/app_addon_sql_mysql.c&r2=511
==============================================================================
--- trunk/app_addon_sql_mysql.c (original)
+++ team/qwell/moddirmagic/apps/app_addon_sql_mysql.c Wed Feb 6 15:37:18 2008
@@ -12,6 +12,10 @@
* the GNU General Public License
*/
+/*** MODULEINFO
+ <depend>mysqlclient</depend>
+ ***/
+
#include <asterisk.h>
#include <stdlib.h>
@@ -34,8 +38,6 @@
#include <asterisk/lock.h>
#include <asterisk/options.h>
#include <asterisk/app.h>
-
-#define AST_MODULE "app_addon_sql_mysql"
#define EXTRA_LOG 0
Propchange: team/qwell/moddirmagic/apps/app_addon_sql_mysql.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddirmagic/apps/app_addon_sql_mysql.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/qwell/moddirmagic/apps/app_addon_sql_mysql.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: team/qwell/moddirmagic/apps/app_fax.c (from r507, trunk/app_fax.c)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/apps/app_fax.c?view=diff&rev=511&p1=trunk/app_fax.c&r1=507&p2=team/qwell/moddirmagic/apps/app_fax.c&r2=511
==============================================================================
--- trunk/app_fax.c (original)
+++ team/qwell/moddirmagic/apps/app_fax.c Wed Feb 6 15:37:18 2008
@@ -18,7 +18,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision:$")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <string.h>
#include <stdlib.h>
@@ -38,10 +38,6 @@
#include "asterisk/app.h"
#include "asterisk/module.h"
#include "asterisk/manager.h"
-
-#ifndef AST_MODULE
-#define AST_MODULE "app_fax"
-#endif
static char *app_sndfax_name = "SendFAX";
static char *app_sndfax_synopsis = "Send a FAX";
Copied: team/qwell/moddirmagic/apps/app_saycountpl.c (from r507, trunk/app_saycountpl.c)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/apps/app_saycountpl.c?view=diff&rev=511&p1=trunk/app_saycountpl.c&r1=507&p2=team/qwell/moddirmagic/apps/app_saycountpl.c&r2=511
==============================================================================
--- trunk/app_saycountpl.c (original)
+++ team/qwell/moddirmagic/apps/app_saycountpl.c Wed Feb 6 15:37:18 2008
@@ -15,8 +15,6 @@
#include <asterisk/module.h>
#include <asterisk/lock.h>
#include <asterisk/app.h>
-
-#define AST_MODULE "ast_saycountpl"
static char *app = "SayCountPL";
Propchange: team/qwell/moddirmagic/apps/app_saycountpl.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddirmagic/apps/app_saycountpl.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/qwell/moddirmagic/apps/app_saycountpl.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: team/qwell/moddirmagic/build_tools/get_makeopts
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/build_tools/get_makeopts?view=auto&rev=511
==============================================================================
--- team/qwell/moddirmagic/build_tools/get_makeopts (added)
+++ team/qwell/moddirmagic/build_tools/get_makeopts Wed Feb 6 15:37:18 2008
@@ -1,0 +1,3 @@
+/\/\*\*\* MAKEOPTS/ {printit=1; next}
+/\*\*\*\// {if (printit) exit}
+// {if (printit) print}
Propchange: team/qwell/moddirmagic/build_tools/get_makeopts
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddirmagic/build_tools/get_makeopts
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/qwell/moddirmagic/build_tools/get_makeopts
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: team/qwell/moddirmagic/build_tools/get_moduleinfo
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/build_tools/get_moduleinfo?view=auto&rev=511
==============================================================================
--- team/qwell/moddirmagic/build_tools/get_moduleinfo (added)
+++ team/qwell/moddirmagic/build_tools/get_moduleinfo Wed Feb 6 15:37:18 2008
@@ -1,0 +1,3 @@
+/\/\*\*\* MODULEINFO/ {printit=1; next}
+/\*\*\*\// {if (printit) exit}
+// {if (printit) print}
Propchange: team/qwell/moddirmagic/build_tools/get_moduleinfo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddirmagic/build_tools/get_moduleinfo
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/qwell/moddirmagic/build_tools/get_moduleinfo
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: team/qwell/moddirmagic/cdr/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 6 15:37:18 2008
@@ -1,0 +1,10 @@
+*.a
+*.d
+*.eo
+*.eoo
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
Added: team/qwell/moddirmagic/cdr/Makefile
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/cdr/Makefile?view=auto&rev=511
==============================================================================
--- team/qwell/moddirmagic/cdr/Makefile (added)
+++ team/qwell/moddirmagic/cdr/Makefile Wed Feb 6 15:37:18 2008
@@ -1,0 +1,20 @@
+#
+# 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 $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
+
+MODULE_PREFIX=cdr
+MENUSELECT_CATEGORY=CDR
+MENUSELECT_DESCRIPTION=Call Detail Recording
+
+all: _all
+
+include $(ASTTOPDIR)/Makefile.moddir_rules
Propchange: team/qwell/moddirmagic/cdr/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddirmagic/cdr/Makefile
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddirmagic/cdr/Makefile
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: team/qwell/moddirmagic/cdr/cdr_addon_mysql.c (from r507, trunk/cdr_addon_mysql.c)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/cdr/cdr_addon_mysql.c?view=diff&rev=511&p1=trunk/cdr_addon_mysql.c&r1=507&p2=team/qwell/moddirmagic/cdr/cdr_addon_mysql.c&r2=511
==============================================================================
--- trunk/cdr_addon_mysql.c (original)
+++ team/qwell/moddirmagic/cdr/cdr_addon_mysql.c Wed Feb 6 15:37:18 2008
@@ -23,6 +23,10 @@
*
*/
+/*** MODULEINFO
+ <depend>mysqlclient</depend>
+ ***/
+
#include <asterisk.h>
#include <sys/types.h>
@@ -49,8 +53,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"
static char *desc = "MySQL CDR Backend";
Propchange: team/qwell/moddirmagic/cdr/cdr_addon_mysql.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddirmagic/cdr/cdr_addon_mysql.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/qwell/moddirmagic/cdr/cdr_addon_mysql.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: team/qwell/moddirmagic/channels/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 6 15:37:18 2008
@@ -1,0 +1,10 @@
+*.a
+*.d
+*.eo
+*.eoo
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
Added: team/qwell/moddirmagic/channels/Makefile
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/channels/Makefile?view=auto&rev=511
==============================================================================
--- team/qwell/moddirmagic/channels/Makefile (added)
+++ team/qwell/moddirmagic/channels/Makefile Wed Feb 6 15:37:18 2008
@@ -1,0 +1,25 @@
+#
+# 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 $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
+
+MODULE_PREFIX=chan
+MENUSELECT_CATEGORY=CHANNELS
+MENUSELECT_DESCRIPTION=Channel Drivers
+
+all: _all
+
+include $(ASTTOPDIR)/Makefile.moddir_rules
+
+clean::
+
+dist-clean::
+
Propchange: team/qwell/moddirmagic/channels/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/qwell/moddirmagic/channels/Makefile
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/qwell/moddirmagic/channels/Makefile
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: team/qwell/moddirmagic/channels/chan_mobile.c (from r507, trunk/chan_mobile.c)
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/channels/chan_mobile.c?view=diff&rev=511&p1=trunk/chan_mobile.c&r1=507&p2=team/qwell/moddirmagic/channels/chan_mobile.c&r2=511
==============================================================================
--- trunk/chan_mobile.c (original)
+++ team/qwell/moddirmagic/channels/chan_mobile.c Wed Feb 6 15:37:18 2008
@@ -69,8 +69,6 @@
#include <asterisk/dsp.h>
#include <asterisk/app.h>
#include <asterisk/manager.h>
-
-#define AST_MODULE "chan_mobile"
#define MBL_CONFIG "mobile.conf"
Modified: team/qwell/moddirmagic/configure.ac
URL: http://svn.digium.com/view/asterisk-addons/team/qwell/moddirmagic/configure.ac?view=diff&rev=511&r1=510&r2=511
==============================================================================
--- team/qwell/moddirmagic/configure.ac (original)
+++ team/qwell/moddirmagic/configure.ac Wed Feb 6 15:37:18 2008
@@ -14,7 +14,7 @@
AC_CANONICAL_TARGET
# check existence of the package
-AC_CONFIG_SRCDIR([res_config_mysql.c])
+AC_CONFIG_SRCDIR([res/res_config_mysql.c])
AC_COPYRIGHT("Asterisk-addons")
AC_REVISION($Revision$)
@@ -146,8 +146,10 @@
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LN_S
+AC_PROG_AWK
AST_CHECK_GNU_MAKE
+AC_PATH_PROG([AWK], [awk], :)
AC_PATH_PROG([GREP], [grep], :)
AC_PATH_PROG([BASENAME], [basename], :)
AC_PATH_PROG([DIRNAME], [dirname], :)
Propchange: team/qwell/moddirmagic/formats/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 6 15:37:18 2008
@@ -1,0 +1,10 @@
+*.a
+*.d
+*.eo
+*.eoo
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
Added: team/qwell/moddirmagic/formats/Makefile
[... 394 lines stripped ...]
More information about the asterisk-addons-commits
mailing list