aboutsummaryrefslogtreecommitdiffstats
path: root/utils/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2008-07-15Merged revisions 130145 via svnmerge from murf1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk Merging this rev from trunk to 1.6.0 was not simple. Why? Because we've enhanced trunk to do a [fast] merge-and-delete operation which also solved problems with contexts having entries from different registrars. Fast as in the amount of time the contexts are locked down. That *is* fast, but traversing the entire dialplan looking for priorities to delete takes more time overall. This particular fix involved pulling in those enhancements from trunk, along with all the various fixes and refinements made along the way. Merging all this from trunk into 1.6 involved: a. mergetrunk6 in the stuff from 130145; b. revert all but the prop changes c. catalog all revisions to pbx.c since 1.6.0 was forked (at rev 105596). d. catalog all revisions to pbx.c in trunk since 1.6.0 was forked, making special note of all revs that were not merged into 1.6.0. e. study each rev in trunk not applied to 1.6.0, and determine if it was involved in the merge_and_delete enhancements in trunk. 25 commits were done in 1.6.0, all but one (106306) was a merge from trunk. Trunk had 22 additional changes, of which 7 were involved in the merge_and_delete enhancements: 106757 108894 109169 116461 123358 130145 130297 f. Go to trunk and collect patches, one by one, of the changes made by each rev across the entire source tree, using svn diff -c <num> > pfile g. Apply each patch in order to 1.6.0, and resolve all failures and compilation problems before proceding to the next patch. h. test the stuff. i. profit! ........ r130145 | murf | 2008-07-11 12:24:31 -0600 (Fri, 11 Jul 2008) | 40 lines (closes issue #13041) Reported by: eliel Tested by: murf (closes issue #12960) Reported by: mnicholson In this 'omnibus' fix, I **think** I solved both the problem in 13041, where unloading pbx_ael.so caused crashes, or incomplete removal of previous registrar'ed entries. And I added code to completely remove all includes, switches, and ignorepats that had a matching registrar entry, which should appease 12960. I also added a lot of seemingly useless brackets around single statement if's, which helped debug so much that I'm leaving them there. I added a routine to check the correlation between the extension tree lists and the hashtab tables. It can be amazingly helpful when you have lots of dialplan stuff, and need to narrow down where a problem is occurring. It's ifdef'd out by default. I cleaned up the code around the new CIDmatch code. It was leaving hanging extens with bad ptrs, getting confused over which objects to remove, etc. I tightened up the code and changed the call to remove_exten in the merge_and_delete code. I added more conditions to check for empty context worthy of deletion. It's not empty if there are any includes, switches, or ignorepats present. If I've missed anything, please re-open this bug, and be prepared to supply example dialplan code. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130946 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-27Merged revisions 125799 via svnmerge from mmichelson1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r125799 | mmichelson | 2008-06-27 09:14:09 -0500 (Fri, 27 Jun 2008) | 3 lines Remove an unneeded target from the Makefile ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125800 f38db490-d61c-443f-a65b-d21fe96a405b
2008-04-10Merged revisions 114052 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r114052 | mmichelson | 2008-04-10 17:02:32 -0500 (Thu, 10 Apr 2008) | 11 lines Merged revisions 114051 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114051 | mmichelson | 2008-04-10 15:59:49 -0500 (Thu, 10 Apr 2008) | 3 lines Fix 1.4 build when LOW_MEMORY is enabled. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114056 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-11Merged revisions 107373 via svnmerge from kpfleming1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r107373 | kpfleming | 2008-03-11 06:36:51 -0500 (Tue, 11 Mar 2008) | 19 lines Merged revisions 107352 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r107352 | kpfleming | 2008-03-11 06:04:29 -0500 (Tue, 11 Mar 2008) | 11 lines fix up various compiler warnings found with gcc-4.3: - the output of flex includes a static function called 'input' that is not used, so for the moment we'll stop having the compiler tell us about unused variables in the flex source files (a better fix would be to improve our flex post-processing to remove the unused function) - main/stdtime/localtime.c makes assumptions about signed integer overflow, and gcc-4.3's improved optimizer tries to take advantage of handling potential overflow conditions at compile time; for now, suppress these optimizations until we can fiure out if the code needs improvement - main/udptl.c has some references to uninitialized variables; in one case there was no bug, but in the other it was certainly possibly for unexpected behavior to occur - main/editline/readline.c had an unused variable ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@107374 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-18Add a canary process, for high priority mode (asterisk -p) to ensure that iftilghman1-1/+1
Asterisk goes into a busy loop, the machine will be recoverable. We'd still need to do a restart to put Asterisk back into high priority mode, but at least a reboot won't be required. (Closes issue #11559) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93804 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-10remove relative paths and use ASTTOPDIR instead.rizzo1-25/+26
Give a default value to ASTTOPDIR if unset so we can at least do a 'make clean' without too much trouble. The proper fix, however, is to partition the top level Makefile in a 'setup' and a 'main' part, in a way that the 'setup' part can be included from subdirs' Makefiles and allow targets to be built without going through the top level Makefile. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92104 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-09add hashtab.c to the list of files deletedrizzo1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92042 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-09normalize subdirs' Makefile by using ASTTOPDIR and not .. to referencerizzo1-1/+1
the top level directory. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92022 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-29let's try this again... *all* compilation and linking in Asterisk should be ↵kpfleming1-3/+2
done using the standard compilation rules, not manually created ones. changing hashtest.c to use these rules caused the compiler to notice a large number of coding guidelines violations, so those are fixed too. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@90150 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-21enable support for stack backtrace for stuff built in utils/rizzo1-0/+2
(this was present in the main tree but forgotten here). git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89506 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-17more cygwin/mingw32 compatibility fixesrizzo1-0/+8
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89373 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-12(closes issue #11221)kpfleming1-2/+2
Reported by: eliel Patches: utils.Makefile.patch uploaded by eliel (modified by me) (license 64) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89190 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-09This is the perhaps the biggest, boldest, most daring change I've ever ↵murf1-3/+11
committed to trunk. Forgive me in advance any disruption this may cause, and please, report any problems via the bugtracker. The upside is that this can speed up large dialplans by 20 times (or more). Context, extension, and priority matching are all fairly constant-time searches. I introduce here my hashtables (hashtabs), and a regression for them. I would have used the ast_obj2 tables, but mine are resizeable, and don't need the object destruction capability. The hashtab stuff is well tested and stable. I introduce a data structure, a trie, for extension pattern matching, in which knowledge of all patterns is accumulated, and all matches can be found via a single traversal of the tree. This is per-context. The trie is formed on the first lookup attempt, and stored in the context for future lookups. Destruction routines are in place for hashtabs and the pattern match trie. You can see the contents of the pattern match trie by using the 'dialplan show' cli command when 'core set debug' has been done to put it in debug mode. The pattern tree traversal only traverses those parts of the tree that are interesting. It uses a scoreboard sort of approach to find the best match. The speed of the traversal is more a function of the length of the pattern than the number of patterns in the tree. The tree also contains the CID matching patterns. See the source code comments for details on how everything works. I believe the approach general enough that any issues that might come up involving fine points in the pattern matching algorithm, can be solved by just tweaking things. We shall see. The current pattern matcher is fairly involved, and replicating every nuance of it is difficult. If you find and report problems, I will try to resolve than as quickly as I can. The trie and hashtabs are added to the existing context and exten structs, and none of the old machinery has been removed for the sake of the multitude of functions that use them. In the future, we can (maybe) weed out the linked lists and save some space. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89129 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-05Move AUDIO_LIBS outside the top level Makefile. This too is used onlyrizzo1-0/+4
in one place. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88770 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-01Remove another copied source file on "make clean".russell1-1/+1
(closes issue #11137) Reported by: IgorG Patches: addonclean-87971-1.patch uploaded by IgorG (license 20) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88062 f38db490-d61c-443f-a65b-d21fe96a405b
2007-10-29UGH... while trying to fix #10995, I found all kinds of cruft in this ↵kpfleming1-20/+14
Makefile. It should all be gone now, and as a side effect hashtest2 now builds with --enable-dev-mode enabled without a host of errors git-svn-id: http://svn.digium.com/svn/asterisk/trunk@87498 f38db490-d61c-443f-a65b-d21fe96a405b
2007-10-29clean up assembler and preprocessor files if they are here tookpfleming1-0/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@87467 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-25Add some files to the utils directory svn:ignore and Makefile clean targetrussell1-0/+1
(closes issue #10808, reported by mvanbaak) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@83741 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-22Fix build of check_expr and hashtest2 when DEBUG_THREADLOCAL is definedtilghman1-3/+3
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@83545 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-11This solves an unreported solaris compile problem (missing -lnsl -lsocket).murf1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82268 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-11fixing up the pthread stuff for hashtest2murf1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82256 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-11Include string compatibility file in hashtest2.file1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82235 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-10Committing my test for astobj2, hashtest2.c, along with makefile changes in ↵murf1-1/+21
utils. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82140 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-20(closes issue #10496)file1-1/+1
Reported by: caio1982 Fix building on OSX. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79989 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-19Add strcompat dependency for check_expr (needed for platforms that don't ↵tilghman1-1/+1
have strndup) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79980 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-15This commit closes bug 7605, and half-closes 7638. The AEL code has been ↵murf1-10/+21
redistributed/repartitioned to allow code re-use both inside and outside of Asterisk. This commit introduces the utils/conf2ael program, and an external config-file reader, for both normal config files, and for extensions.conf (context, exten, prio); It provides an API for programs outside of asterisk to use to play with the dialplan and config files. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79595 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-05Merged revisions 67526 via svnmerge from murf1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r67526 | murf | 2007-06-05 15:30:18 -0600 (Tue, 05 Jun 2007) | 1 line this fixes bug 9883, wherein macros were not allowing the includes construct. fixed and tested, looks OK. Now includes can serve as an adjunct to catch. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@67529 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-22Merged revisions 59145 via svnmerge from murf1-0/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r59145 | murf | 2007-03-22 08:40:53 -0600 (Thu, 22 Mar 2007) | 1 line The stuff in utils was compiling with -O6 even if DONT_OPTIMIZE is set in menuconfig. Added the include to fix that ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@59146 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-24Merged revisions 52052 via svnmerge from murf1-2/+3
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r52052 | murf | 2007-01-24 11:26:22 -0700 (Wed, 24 Jan 2007) | 9 lines Merged revisions 52002 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r52002 | murf | 2007-01-24 10:43:50 -0700 (Wed, 24 Jan 2007) | 1 line updated check_expr via 8322 (refactoring of expression checking impl); elfring contributed a nice code reorg, I contributed some time to get it working again, better messages ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@52053 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-16Merged revisions 48525 via svnmerge from kpfleming1-12/+5
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r48525 | kpfleming | 2006-12-16 15:14:34 -0600 (Sat, 16 Dec 2006) | 2 lines simplify dependency tracking system, using the compiler's built-in method for generating them, and only doing dependency tracking if developer mode is enabled via the configure script ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48527 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-28Merged revisions 46377 via svnmerge from file1-0/+4
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r46377 | file | 2006-10-28 12:37:44 -0400 (Sat, 28 Oct 2006) | 2 lines Don't build muted on OpenBSD, it is not supported. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46378 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-05Merged revisions 44436 via svnmerge from kpfleming1-2/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r44436 | kpfleming | 2006-10-04 20:42:06 -0500 (Wed, 04 Oct 2006) | 2 lines this change was correct, the old version is no longer needed ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44437 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-04correct libraries for astman, at least so i think...rizzo1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44410 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-29Merged revisions 44055 via svnmerge from kpfleming1-18/+33
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r44055 | kpfleming | 2006-09-29 17:47:40 -0500 (Fri, 29 Sep 2006) | 2 lines fix a few build system bugs, and convert Makefiles to be compatible with GNU make 3.80 ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44056 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-29Merged revisions 43996-43997,44008,44011-44012 via svnmerge from kpfleming1-5/+5
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43996 | kpfleming | 2006-09-29 11:47:05 -0500 (Fri, 29 Sep 2006) | 2 lines another cross-compile fix ........ r43997 | kpfleming | 2006-09-29 11:52:27 -0500 (Fri, 29 Sep 2006) | 2 lines support --without-curl in configure script ........ r44008 | kpfleming | 2006-09-29 13:25:49 -0500 (Fri, 29 Sep 2006) | 2 lines don't abuse CFLAGS and LDFLAGS for build of Asterisk components, because they are also then used for non-Asterisk components (like menuselect); use our own variables instead ........ r44011 | kpfleming | 2006-09-29 13:40:17 -0500 (Fri, 29 Sep 2006) | 2 lines missed one conversion to ASTCFLAGS ........ r44012 | kpfleming | 2006-09-29 13:49:07 -0500 (Fri, 29 Sep 2006) | 2 lines yet another place where we were not using the correct CFLAGS by default ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44013 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-19be a little more consistent with our variable usageqwell1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43257 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-18Change the includes to work on FreeBSDqwell1-0/+1
Linux has sys/soundcard.h, which does a #include <linux/soundcard.h> git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43240 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-15Many Solaris fixes - this moves some of the stuff from utils.c to strcompat.cqwell1-3/+5
Every OS uses strcompat now - this was done on purpose. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@42982 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-09more makefile tweaks to keep targets from being run when they don't need to bekpfleming1-1/+3
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@42505 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-26GNU make already knows how to quietly ignore non-existent files in 'include' ↵kpfleming1-3/+1
directives git-svn-id: http://svn.digium.com/svn/asterisk/trunk@41209 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-25Changes to fix all problems reported in 7804 are included here.murf1-4/+4
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@41150 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-21build muted by default, since there is no Makefile target for it anymorekpfleming1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@40770 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-21merge new_loader_completion branch, including (at least):kpfleming1-15/+19
- restructured build tree and makefiles to eliminate recursion problems - support for embedded modules - support for static builds - simpler cross-compilation support - simpler module/loader interface (no exported symbols) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-15use LDFLAGS and LIBS properly, and allow dependencies to provide LDFLAGS if ↵kpfleming1-7/+6
needed (although none do today) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37653 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-06make the build output less noisy (optional, can be controlled by the ↵kpfleming1-34/+21
NOISY_BUILD variable in the top-level Makefile) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37273 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-22- convert the 'uninstall' target to use separate targets to process eachrussell1-1/+1
subdirectory instead of a for loop - remove the FORCE target from the main Makefile and add the couple places I used it to the .PHONY target. .PHONY does the same thing and is a built-in more efficient way of doing it. - add a bunch more targets to .PHONY ... git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35503 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-22- specify that 'depend' is a .PHONY targetrussell1-1/+1
- use separate targets instead of a for loop for doing 'make depend' for each sub directory git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35501 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-22- specify that 'all' is a .PHONY targetrussell1-2/+2
- add a copyright header to the build_tools Makefile - remove 'depend' from the 'all' target in agi/ and utils/ since it is handled by the main Makefile already git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35479 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-22add the 'clean', 'clean-depend', and 'dist-clean' targets as .PHONY targetsrussell1-0/+2
since they are targets that do not have resulting files and are never listed as prerequisites to real targets. Using .PHONY in this manner improves make performance by never having to check for resulting files. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35415 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-13minor fixkpfleming1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@33869 f38db490-d61c-443f-a65b-d21fe96a405b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 19:13:54 +0000