[asterisk-addons-commits] qwell: branch 1.4 r530 - in /branches/1.4: ./ apps/ asterisk-ooh323c/ build_t...
SVN commits to the Asterisk addons project
asterisk-addons-commits at lists.digium.com
Wed Feb 13 16:58:12 CST 2008
Author: qwell
Date: Wed Feb 13 16:58:11 2008
New Revision: 530
URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=530
Log:
moddirify!
Merged from team/qwell/moddir_1.4/
Added:
branches/1.4/Makefile.moddir_rules
- copied unchanged from r529, team/qwell/moddir_14/Makefile.moddir_rules
branches/1.4/apps/ (props changed)
- copied from r529, team/qwell/moddir_14/apps/
branches/1.4/apps/Makefile
- copied unchanged from r529, team/qwell/moddir_14/apps/Makefile
branches/1.4/apps/app_addon_sql_mysql.c
- copied unchanged from r529, team/qwell/moddir_14/apps/app_addon_sql_mysql.c
branches/1.4/apps/app_saycountpl.c
- copied unchanged from r529, team/qwell/moddir_14/apps/app_saycountpl.c
branches/1.4/build_tools/get_makeopts
- copied unchanged from r529, team/qwell/moddir_14/build_tools/get_makeopts
branches/1.4/build_tools/get_moduleinfo
- copied unchanged from r529, team/qwell/moddir_14/build_tools/get_moduleinfo
branches/1.4/cdr/ (props changed)
- copied from r529, team/qwell/moddir_14/cdr/
branches/1.4/cdr/Makefile
- copied unchanged from r529, team/qwell/moddir_14/cdr/Makefile
branches/1.4/cdr/cdr_addon_mysql.c
- copied unchanged from r529, team/qwell/moddir_14/cdr/cdr_addon_mysql.c
branches/1.4/channels/ (props changed)
- copied from r529, team/qwell/moddir_14/channels/
branches/1.4/channels/Makefile
- copied unchanged from r529, team/qwell/moddir_14/channels/Makefile
branches/1.4/channels/chan_ooh323.c
- copied unchanged from r529, team/qwell/moddir_14/channels/chan_ooh323.c
branches/1.4/channels/chan_ooh323.h
- copied unchanged from r529, team/qwell/moddir_14/channels/chan_ooh323.h
branches/1.4/channels/ooh323c/
- copied from r529, team/qwell/moddir_14/channels/ooh323c/
branches/1.4/channels/ooh323c/COPYING (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/COPYING
branches/1.4/channels/ooh323c/README (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/README
branches/1.4/channels/ooh323c/src/
- copied from r529, team/qwell/moddir_14/channels/ooh323c/src/
branches/1.4/channels/ooh323c/src/Makefile.in (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/Makefile.in
branches/1.4/channels/ooh323c/src/context.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/context.c
branches/1.4/channels/ooh323c/src/decode.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/decode.c
branches/1.4/channels/ooh323c/src/dlist.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/dlist.c
branches/1.4/channels/ooh323c/src/dlist.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/dlist.h
branches/1.4/channels/ooh323c/src/encode.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/encode.c
branches/1.4/channels/ooh323c/src/errmgmt.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/errmgmt.c
branches/1.4/channels/ooh323c/src/eventHandler.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/eventHandler.c
branches/1.4/channels/ooh323c/src/eventHandler.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/eventHandler.h
branches/1.4/channels/ooh323c/src/h323/
- copied from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/
branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGES.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/H235-SECURITY-MESSAGES.h
branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c
branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c
branches/1.4/channels/ooh323c/src/h323/H323-MESSAGES.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/H323-MESSAGES.c
branches/1.4/channels/ooh323c/src/h323/H323-MESSAGES.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/H323-MESSAGES.h
branches/1.4/channels/ooh323c/src/h323/H323-MESSAGESDec.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/H323-MESSAGESDec.c
branches/1.4/channels/ooh323c/src/h323/H323-MESSAGESEnc.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/H323-MESSAGESEnc.c
branches/1.4/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c
branches/1.4/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
branches/1.4/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c
branches/1.4/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c
branches/1.4/channels/ooh323c/src/memheap.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/memheap.c
branches/1.4/channels/ooh323c/src/memheap.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/memheap.h
branches/1.4/channels/ooh323c/src/ooCalls.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooCalls.c
branches/1.4/channels/ooh323c/src/ooCalls.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooCalls.h
branches/1.4/channels/ooh323c/src/ooCapability.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooCapability.c
branches/1.4/channels/ooh323c/src/ooCapability.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooCapability.h
branches/1.4/channels/ooh323c/src/ooCmdChannel.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooCmdChannel.c
branches/1.4/channels/ooh323c/src/ooCmdChannel.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooCmdChannel.h
branches/1.4/channels/ooh323c/src/ooCommon.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooCommon.h
branches/1.4/channels/ooh323c/src/ooDateTime.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooDateTime.c
branches/1.4/channels/ooh323c/src/ooDateTime.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooDateTime.h
branches/1.4/channels/ooh323c/src/ooGkClient.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooGkClient.c
branches/1.4/channels/ooh323c/src/ooGkClient.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooGkClient.h
branches/1.4/channels/ooh323c/src/ooLogChan.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooLogChan.c
branches/1.4/channels/ooh323c/src/ooLogChan.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooLogChan.h
branches/1.4/channels/ooh323c/src/ooSocket.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooSocket.c
branches/1.4/channels/ooh323c/src/ooSocket.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooSocket.h
branches/1.4/channels/ooh323c/src/ooStackCmds.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooStackCmds.c
branches/1.4/channels/ooh323c/src/ooStackCmds.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooStackCmds.h
branches/1.4/channels/ooh323c/src/ooTimer.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooTimer.c
branches/1.4/channels/ooh323c/src/ooTimer.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooTimer.h
branches/1.4/channels/ooh323c/src/ooUtils.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooUtils.c
branches/1.4/channels/ooh323c/src/ooUtils.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooUtils.h
branches/1.4/channels/ooh323c/src/ooasn1.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooasn1.h
branches/1.4/channels/ooh323c/src/oochannels.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/oochannels.c
branches/1.4/channels/ooh323c/src/oochannels.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/oochannels.h
branches/1.4/channels/ooh323c/src/ooh245.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooh245.c
branches/1.4/channels/ooh323c/src/ooh245.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooh245.h
branches/1.4/channels/ooh323c/src/ooh323.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooh323.c
branches/1.4/channels/ooh323c/src/ooh323.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooh323.h
branches/1.4/channels/ooh323c/src/ooh323ep.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooh323ep.c
branches/1.4/channels/ooh323c/src/ooh323ep.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooh323ep.h
branches/1.4/channels/ooh323c/src/oohdr.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/oohdr.h
branches/1.4/channels/ooh323c/src/ooper.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooper.h
branches/1.4/channels/ooh323c/src/ooports.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooports.c
branches/1.4/channels/ooh323c/src/ooports.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooports.h
branches/1.4/channels/ooh323c/src/ooq931.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooq931.c
branches/1.4/channels/ooh323c/src/ooq931.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ooq931.h
branches/1.4/channels/ooh323c/src/ootrace.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ootrace.c
branches/1.4/channels/ooh323c/src/ootrace.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ootrace.h
branches/1.4/channels/ooh323c/src/ootypes.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/ootypes.h
branches/1.4/channels/ooh323c/src/perutil.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/perutil.c
branches/1.4/channels/ooh323c/src/printHandler.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/printHandler.c
branches/1.4/channels/ooh323c/src/printHandler.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/printHandler.h
branches/1.4/channels/ooh323c/src/rtctype.c (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/rtctype.c
branches/1.4/channels/ooh323c/src/rtctype.h (props changed)
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323c/src/rtctype.h
branches/1.4/channels/ooh323cDriver.c
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323cDriver.c
branches/1.4/channels/ooh323cDriver.h
- copied unchanged from r529, team/qwell/moddir_14/channels/ooh323cDriver.h
branches/1.4/configs/ooh323.conf.sample
- copied unchanged from r529, team/qwell/moddir_14/configs/ooh323.conf.sample
branches/1.4/doc/ChangeLog.chan_ooh323
- copied unchanged from r529, team/qwell/moddir_14/doc/ChangeLog.chan_ooh323
branches/1.4/doc/chan_ooh323.txt
- copied unchanged from r529, team/qwell/moddir_14/doc/chan_ooh323.txt
branches/1.4/formats/ (props changed)
- copied from r529, team/qwell/moddir_14/formats/
branches/1.4/formats/Makefile
- copied unchanged from r529, team/qwell/moddir_14/formats/Makefile
branches/1.4/formats/format_mp3.c
- copied unchanged from r529, team/qwell/moddir_14/formats/format_mp3.c
branches/1.4/formats/mp3/ (props changed)
- copied from r529, team/qwell/moddir_14/formats/mp3/
branches/1.4/formats/mp3/MPGLIB_README
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/MPGLIB_README
branches/1.4/formats/mp3/MPGLIB_TODO
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/MPGLIB_TODO
branches/1.4/formats/mp3/Makefile
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/Makefile
branches/1.4/formats/mp3/README
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/README
branches/1.4/formats/mp3/common.c
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/common.c
branches/1.4/formats/mp3/dct64_i386.c
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/dct64_i386.c
branches/1.4/formats/mp3/decode_i386.c
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/decode_i386.c
branches/1.4/formats/mp3/decode_ntom.c
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/decode_ntom.c
branches/1.4/formats/mp3/huffman.h
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/huffman.h
branches/1.4/formats/mp3/interface.c
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/interface.c
branches/1.4/formats/mp3/layer3.c
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/layer3.c
branches/1.4/formats/mp3/mpg123.h
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/mpg123.h
branches/1.4/formats/mp3/mpglib.h
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/mpglib.h
branches/1.4/formats/mp3/tabinit.c
- copied unchanged from r529, team/qwell/moddir_14/formats/mp3/tabinit.c
branches/1.4/res/ (props changed)
- copied from r529, team/qwell/moddir_14/res/
branches/1.4/res/Makefile
- copied unchanged from r529, team/qwell/moddir_14/res/Makefile
branches/1.4/res/res_config_mysql.c
- copied unchanged from r529, team/qwell/moddir_14/res/res_config_mysql.c
Removed:
branches/1.4/app_addon_sql_mysql.c
branches/1.4/app_saycountpl.c
branches/1.4/asterisk-ooh323c/
branches/1.4/cdr_addon_mysql.c
branches/1.4/format_mp3/
branches/1.4/menuselect-tree
branches/1.4/res_config_mysql.c
Modified:
branches/1.4/ (props changed)
branches/1.4/Makefile
branches/1.4/Makefile.rules
branches/1.4/aclocal.m4
branches/1.4/configure
branches/1.4/configure.ac
branches/1.4/makeopts.in
Propchange: branches/1.4/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Feb 13 16:58:11 2008
@@ -8,3 +8,5 @@
.depend
menuselect.makeopts
menuselect.makedeps
+makeopts.embed_rules
+menuselect-tree
Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/Makefile?view=diff&rev=530&r1=529&r2=530
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Wed Feb 13 16:58:11 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,65 @@
SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
endif
-__all: all
+SUBMAKE:=$(MAKE) --quiet --no-print-directory
+
+# $(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 $(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+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_EMBED_LDFLAGS):
+ @echo "EMBED_LDFLAGS+="`$(SUBMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_EMBED_LIBS):
+ @echo "EMBED_LIBS+="`$(SUBMAKE) -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) --no-print-directory $(MOD_SUBDIRS_EMBED_LDSCRIPT)
+ @$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDFLAGS)
+ @$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LIBS)
+
+$(SUBDIRS): makeopts.embed_rules
+
+$(MOD_SUBDIRS):
+ @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
+
+$(OTHER_SUBDIRS):
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
config.status: configure
@./configure
@@ -95,14 +150,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 +161,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 --no-print-directory -C $(@:-install=) install
+
+$(SUBDIRS_CLEAN):
+ @$(MAKE) --no-print-directory -C $(@:-clean=) clean
+
+$(SUBDIRS_DIST_CLEAN):
+ @$(MAKE) --no-print-directory -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 +211,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
@@ -201,4 +227,13 @@
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
+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) menuselect.makeopts
Modified: branches/1.4/Makefile.rules
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/Makefile.rules?view=diff&rev=530&r1=529&r2=530
==============================================================================
--- branches/1.4/Makefile.rules (original)
+++ branches/1.4/Makefile.rules Wed Feb 13 16:58:11 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: branches/1.4/aclocal.m4
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/aclocal.m4?view=diff&rev=530&r1=529&r2=530
==============================================================================
--- branches/1.4/aclocal.m4 (original)
+++ branches/1.4/aclocal.m4 Wed Feb 13 16:58:11 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: branches/1.4/apps/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 13 16:58:11 2008
@@ -1,0 +1,8 @@
+*.a
+*.d
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
Propchange: branches/1.4/cdr/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 13 16:58:11 2008
@@ -1,0 +1,8 @@
+*.a
+*.d
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
Propchange: branches/1.4/channels/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 13 16:58:11 2008
@@ -1,0 +1,8 @@
+*.a
+*.d
+*.i
+*.makeopts
+*.moduleinfo
+*.s
+*.so
+modules.link
Propchange: branches/1.4/channels/ooh323c/COPYING
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/COPYING
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/COPYING
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/README
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/README
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/README
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/Makefile.in
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/Makefile.in
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/Makefile.in
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/context.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/context.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/context.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/decode.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/decode.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/decode.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/dlist.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/dlist.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/dlist.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/dlist.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/dlist.h
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/dlist.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/encode.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/encode.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/encode.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/errmgmt.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/errmgmt.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/errmgmt.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/eventHandler.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/eventHandler.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/eventHandler.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/eventHandler.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/eventHandler.h
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/eventHandler.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGES.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGES.h
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGES.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGES.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGES.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGES.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGES.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGES.h
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGES.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGESDec.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGESDec.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGESDec.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGESEnc.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGESEnc.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/h323/H323-MESSAGESEnc.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: branches/1.4/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: branches/1.4/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: branches/1.4/channels/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
[... 655 lines stripped ...]
More information about the asterisk-addons-commits
mailing list