aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2010-03-15Merged revisions 252361 via svnmerge from tilghman1-0/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r252361 | tilghman | 2010-03-14 20:33:50 -0500 (Sun, 14 Mar 2010) | 4 lines Launch Asterisk on Mac OS X with launchd. Reviewboard: https://reviewboard.asterisk.org/r/551/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@252362 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-18Merged revisions 247422 via svnmerge from russell1-0/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r247422 | russell | 2010-02-17 22:19:01 -0600 (Wed, 17 Feb 2010) | 10 lines Tweak argument handling for wget in the sounds Makefile. 1) Fix the check to see if we are using wget to not be full of fail. The configure script populates this variable with the absolute path to wget if it is found, so it didn't work. 2) Allow some extra arguments to be passed in for wget. This is just a simple change to allow our Bamboo build script to tell wget to be quiet and not fill up our logs with download status output. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@247423 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-15Merged revisions 246709 via svnmerge from tilghman1-0/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r246709 | tilghman | 2010-02-15 17:42:33 -0600 (Mon, 15 Feb 2010) | 5 lines Make the menuselect instructions correct by allowing 'make menuselect' to actually solve dependency problems. (Previously, it would fail out again with the same message about running 'make menuselect', which was NOT at all helpful.) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@246710 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-27Add new option to asterisk.conf (lockconfdir) to protect conf dir during reloadsjpeeler1-0/+1
(closes issue #16358) Reported by: raarts Patches: lockconfdir.diff uploaded by raarts (license 937) modified by me git-svn-id: http://svn.digium.com/svn/asterisk/trunk@243551 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-20Merged revisions 241626 via svnmerge from dvossel1-5/+5
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r241626 | dvossel | 2010-01-20 14:00:04 -0600 (Wed, 20 Jan 2010) | 6 lines fixes parsing error in Makefile. Some echo lines were missing "; . Thanks to jparker for pointing out the problem. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@241627 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-19Allow parallel make (-j) to work properly.qwell1-2/+2
After some back and forth with the reporter, we came up with the necessary changes. (closes issue #16489) Reported by: Chainsaw Patches: asterisk-1.6.2.1-parallel-make-minimal.patch uploaded by Chainsaw (license 723) Tested by: Chainsaw, qwell git-svn-id: http://svn.digium.com/svn/asterisk/trunk@241230 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-18transmit_silence_during_record replaced by transmit_silencedvossel1-1/+0
In asterisk.conf, transmit_silence_during_record has been removed in favor of using only the transmit_silence option. The transmit_silence_during_record option remains a valid option in asterisk.conf, but has been removed from the sample config and noted in CHANGES. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@240971 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-18updated transmit_silence option documentation in asterisk.confdvossel1-1/+5
This patch updates the transmit_silence option to better document why the option exists, and what it affects. Thanks to russell for providing the verbage for this update. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@240887 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-15Err, oops, it was already the way I intended.tilghman1-4/+4
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@240629 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-15Merged revisions 240547 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r240547 | russell | 2010-01-15 17:06:11 -0600 (Fri, 15 Jan 2010) | 2 lines Fix a spelling error in the asterisk.conf sample. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@240548 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-13add silence gen to wait appsdvossel1-1/+1
asterisk.conf's 'transmit_silence' option existed before this patch, but was limited to only generating silence while recording and sending DTMF. Now enabling the transmit_silence option generates silence during wait times as well. To achieve this, ast_safe_sleep has been modified to generate silence anytime no other generators are present and transmit_silence is enabled. Wait apps not using ast_safe_sleep now generate silence when transmit_silence is enabled as well. (closes issue #16524) Reported by: kobaz (closes issue #16523) Reported by: kobaz Tested by: dvossel Review: https://reviewboard.asterisk.org/r/456/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@239712 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-11Permit more options in the Makefile as to startup optionstilghman1-0/+4
(closes issue #16454) Reported by: syspert Patches: 20091228__issue16454__3.diff.txt uploaded by tilghman (license 14) Tested by: syspert git-svn-id: http://svn.digium.com/svn/asterisk/trunk@239231 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-11Including bundle1.o breaks Tiger and Leopardtilghman1-2/+5
(issue #16449) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@239191 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-10It's been long enough -- make the behavior introduced in 1.6 the default.tilghman1-4/+4
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@239000 f38db490-d61c-443f-a65b-d21fe96a405b
2009-12-10Merged revisions 234255 via svnmerge from qwell1-6/+7
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r234255 | qwell | 2009-12-10 14:58:09 -0600 (Thu, 10 Dec 2009) | 9 lines Fix unselecting of menuselect options via GLOBAL_MAKEOPTS and USER_MAKEOPTS. (closes issue #16296) Reported by: abelbeck Patches: issue16296-20091210.diff uploaded by qwell (license 4) (abelbeck described a fix, which I expanded upon) Tested by: abelbeck, qwell, lmadsen ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@234256 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-03Fix some build issues on Solaris.qwell1-1/+1
(closes issue #14517) (SWP-109) Reported by: asgaroth Patches: bug_14517.diff uploaded by snuffy (license 35) Tested by: asgaroth, snuffy, dougm, qwell git-svn-id: http://svn.digium.com/svn/asterisk/trunk@227372 f38db490-d61c-443f-a65b-d21fe96a405b
2009-11-03Merged revisions 227088 via svnmerge from oej1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r227088 | oej | 2009-11-03 11:29:59 +0100 (Tis, 03 Nov 2009) | 7 lines Use proper response code when violating Contact ACL's. https://reviewboard.asterisk.org/r/415/ Thanks kpfleming for a quick review. (EDVX-003) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@227091 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-27Adding compile time flags for Snow Leopard, Leopard and some other animalsoej1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@226184 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-23Optionally build and install the sample AGIs in the agi/ directory.seanbright1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@225690 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-23Merged revisions 225581 via svnmerge from kpfleming1-3/+28
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r225581 | kpfleming | 2009-10-23 09:00:01 -0500 (Fri, 23 Oct 2009) | 10 lines Don't force menuselect.makeopts to be rebuilt on every build. For some reason the menuselect.makeopts file was listed as PHONY in the Makefile, resulting in 'make' needing to rebuild it for every build. This then resulted in the embedded module rules being rebuilt on every build, which can be slow and is unnecessary. This patch fixes the problem by properly allowing 'make' to know when the menuselect.makeopts file needs to be rebuilt (defining the proper dependencies). ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@225582 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-22Add the programs in utils/ to menuselect.seanbright1-1/+2
Nothing in utils/ is now built by default except for astcanary. Review: https://reviewboard.asterisk.org/r/353/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@225440 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-24Merged revisions 220213 via svnmerge from seanbright1-2/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r220213 | seanbright | 2009-09-24 14:18:18 -0400 (Thu, 24 Sep 2009) | 1 line Resolve parallel build warnings. Reported by Klaus Darilion on the asterisk-dev mailing list. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@220217 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-24Merged revisions 220099 via svnmerge from seanbright1-1/+3
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r220099 | seanbright | 2009-09-24 10:41:57 -0400 (Thu, 24 Sep 2009) | 2 lines Remove the remaining bashisms in the Makefile/mkpkgconfig ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@220100 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-30Force Darwin on ppc platforms to compile with a target level that supports ↵tilghman1-1/+1
aliasing. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@214898 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-28Ensure that CFLAGS and/or LDFLAGS provided to configure script are preserved.kpfleming1-3/+10
Cross-compilation environments want to provide 'defaults' for compiler and linker options, and frequently do this by specifying CFLAGS and LDFLAGS in the environment or as command-line arguments to the configure script. This patch modifies the configure script and Makefile to preserve these settings and ensure they are used in the build process. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@214696 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-25The DTD should be installed in the same path as the rest of the XML ↵tilghman1-1/+1
documentation. (closes issue #15344) Reported by: tzafrir Patches: makefile_appdocs_dtd.diff uploaded by tzafrir (license 46) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@213904 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-25Merged revisions 213899 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r213899 | tilghman | 2009-08-24 21:40:22 -0500 (Mon, 24 Aug 2009) | 4 lines Use the default runlevels for Debian derivatives, instead of making up our own. (closes issue #14730) Reported by: pkempgen ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@213900 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-04Merged revisions 210237 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r210237 | kpfleming | 2009-08-04 09:51:39 -0500 (Tue, 04 Aug 2009) | 10 lines Eliminate spurious compiler warnings from system headers on *BSD platforms. Ensure that system headers located in /usr/local/include are actually treated as system headers by the compiler, and not as local headers which are subject to warnings from the -Wundef compiler option and others. (closes issue #15606) Reported by: mvanbaak ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@210238 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-01Revert accidental Makefile change.kpfleming1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@209761 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-01Merged revisions 209759 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r209759 | kpfleming | 2009-07-31 19:52:00 -0500 (Fri, 31 Jul 2009) | 7 lines Minor changes inspired by testing with latest GCC. The latest GCC (what will become 4.5.x) has a few new warnings, that in these cases found some either downright buggy code, or at least seriously poorly designed code that could be improved. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@209760 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-27Restore explicit export of ASTCFLAGS/ASTLDFLAGS and underscore-variants to ↵kpfleming1-4/+3
sub-makes. During the recent Makefile improvements I made, it seemed the 'make' was automatically carrying down the ASTCFLAGS/ASTLDFLAGS settings to sub-makes, so I removed the explict export of them. However, there are some circumstances where make does this, and some where it does not, so I've brought them back to ensure they are always exported. I also removed an extraneous double setting of _ASTLDFLAGS on *BSD platforms. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@209056 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-21Merged revisions 207647 via svnmerge from kpfleming1-43/+35
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r207647 | kpfleming | 2009-07-21 08:04:44 -0500 (Tue, 21 Jul 2009) | 12 lines Ensure that user-provided CFLAGS and LDFLAGS are honored. This commit changes the build system so that user-provided flags (in ASTCFLAGS and ASTLDFLAGS) are supplied to the compiler/linker *after* all flags provided by the build system itself, so that the user can effectively override the build system's flags if desired. In addition, ASTCFLAGS and ASTLDFLAGS can now be provided *either* in the environment before running 'make', or as variable assignments on the 'make' command line. As a result, the use of COPTS and LDOPTS is no longer necessary, so they are no longer documented, but are still supported so as not to break existing build systems that supply them when building Asterisk. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@207680 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-30Make addons build last - this is for Qwell.russell1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@204420 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-30Move Asterisk-addons modules into the main Asterisk source tree.russell1-1/+1
Someone asked yesterday, "is there a good reason why we can't just put these modules in Asterisk?". After a brief discussion, as long as the modules are clearly set aside in their own directory and not enabled by default, it is perfectly fine. For more information about why a module goes in addons, see README-addons.txt. chan_ooh323 does not currently compile as it is behind some trunk API updates. However, it will not build by default, so it should be okay for now. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@204413 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-26Merge the new Channel Event Logging (CEL) subsystem.russell1-1/+3
CEL is the new system for logging channel events. This was inspired after facing many problems trying to represent what is possible to happen to a call in Asterisk using CDR records. For more information on CEL, see the built in HTML or PDF documentation generated from the files in doc/tex/. Many thanks to Steve Murphy (murf) and Brian Degenhardt (bmd) for their hard work developing this code. Also, thanks to Matt Nicholson (mnicholson) and Sean Bright (seanbright) for their assistance in the final push to get this code ready for Asterisk trunk. Review: https://reviewboard.asterisk.org/r/239/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@203638 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-16When compiling in an Emacs-spawned shell, always print directory names.kpfleming1-0/+4
This change ensures that Emacs can find the proper source files when parsing compiler error messages, since it uses the 'make' output including directory names to do it. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@201135 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-15Redesigned 'optional API' support.kpfleming1-1/+1
This patch provides a new implementation of the optional API support defined in asterisk/optional_api.h; this new version provides solves compatibility issues with the use of linker version scripts for suppressing global symbols. In addition, there is now a functional (and tested!) implementation for Mac OS/X, so module writers no longer need to use special tests before calling optional API functions. All future implementations must provide these same semantics, so that module writers can rely on them. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@200519 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-09Fix all of the parallel build warnings issued when running make -j#.seanbright1-19/+19
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@199781 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-06Switch from "echo -n" to printf. On my mac, the -n was just getting printed ↵russell1-2/+2
out. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@199368 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-29Merged revisions 197998 via svnmerge from seanbright1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r197998 | seanbright | 2009-05-29 14:14:12 -0400 (Fri, 29 May 2009) | 8 lines Fix 'make config' target for Slackware. There was a missing semi-colon after the echo statement in the Makefile that was causing problems for some users. Fix suggested by reporter. (closes issue #15225) Reported by: pdavis ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@198000 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-27Use bash explicitly when calling build_tools/mkpkgconfig from the Makefile.seanbright1-1/+1
Since we use bashisms in build_tools/mkpkgconfig, we should call on bash explicitly when running from the Makefile, otherwise we get errors during a 'make install.' (closes issue #15209) Reported by: seandarcy git-svn-id: http://svn.digium.com/svn/asterisk/trunk@197260 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-16Allow to include sections of other parts of the xml documentation.eliel1-1/+1
Avoid duplicating xml documentation by allowing to include other parts of the xml documentation using XInclude. Example: <xi:include xpointer="xpointer(/docs/function[@name='CHANNEL']/synopsis)" /> (Insert this line to include the synopsis of the CHANNEL function xml documentation). It is also possible to include documentation from other files in the 'documentation/' directory using the href="" attribute inside a xinclude element. (closes issue #15107) Reported by: lmadsen (issue #14444) Reported by: ewieling git-svn-id: http://svn.digium.com/svn/asterisk/trunk@194982 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-03Remove unnecessary compiler flagrussell1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@191884 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-28Build XML documention from *only* the source files that have docs in themkpfleming1-1/+1
Change the build process so that doc/core-en_US.xml is dependent solely on the source files that have documentation in them, not on all source files. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@190865 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-08Start splitting up miscellaneous doxygen documentation into separate files.russell1-0/+2
doxyref.h was created to hold miscellaneous documentation that was not specific to a part of the code. This file has grown quite a bit so I decided to start splitting parts of it out into new files. Now, you can drop a new file into include/asterisk/doxygen/ and it will be processed by doxygen. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@186953 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-05Make sure we terminate the first s| command so we can actually produce ↵mvanbaak1-6/+6
correct files. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180382 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-05Merge phase 1 support for the new bridging architecture.file1-1/+1
This commit brings in the bridging core, bridging technologies, and the ConfBridge application. For usage information on the ConfBridge application please see the output of "core show application ConfBridge" from the CLI. For API documentation please see the doxygen page describing the architecture and the documentation for each API call. Review: http://reviewboard.digium.com/r/93/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180369 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-21set ASTVARRUNDIR=$(localstatedir)/run/asterisk as default pathmvanbaak1-7/+13
When running asterisk as non-root and without this patch the pidfile wants to go into /var/run/asterisk.pid. This directory is not writable for the non-root user and changing permissions is not an option. Putting it in /var/run/asterisk/asterisk.pid makes it possible to set permissions on the /var/run/asterisk dir so everything works as it should be. Patched committed is based on pabelanger's patch. (closes issue #13153) Reported by: pabelanger Patches: 2009012900_bug13153-nonrootscripts.diff.txt uploaded by mvanbaak (license 7) Review: http://reviewboard.digium.com/r/139/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@177852 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-13Add option to hide console connect messagestwilson1-0/+1
(closes issue #14222) Reported by: jamesgolovich Patches: asterisk-hideconnect.diff.txt uploaded by jamesgolovich (license 176) Tested by: otherwiseguy git-svn-id: http://svn.digium.com/svn/asterisk/trunk@168585 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-29incorporates r159808 from branches/1.4:kpfleming1-1/+7
------------------------------------------------------------------------ r159808 | kpfleming | 2008-11-29 10:58:29 -0600 (Sat, 29 Nov 2008) | 7 lines update dev-mode compiler flags to match the ones used by default on Ubuntu Intrepid, so all developers will see the same warnings and errors since this branch already had some printf format attributes, enable checking for them and tag functions that didn't have them format attributes in a consistent way ------------------------------------------------------------------------ in addition: move some format attributes from main/utils.c to the header files they belong in, and fix up references to the relevant functions based on new compiler warnings git-svn-id: http://svn.digium.com/svn/asterisk/trunk@159818 f38db490-d61c-443f-a65b-d21fe96a405b