dect
/
asterisk
Archived
13
0
Fork 0
Commit Graph

52 Commits

Author SHA1 Message Date
kpfleming d4e966efcc Merged revisions 93180 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r93180 | kpfleming | 2007-12-16 22:44:51 -0800 (Sun, 16 Dec 2007) | 23 lines

In http://lists.digium.com/pipermail/asterisk-dev/2007-December/031145.html,
rizzo brought up some issues related to the way that the metadata required
for menuselect and the rest of the build system is extracted from the source
files. Since I had a few hours to kill on an airplane today, I decided to
improve this situation... so now the system caches the extracted metadata
and uses it to build the menuselect 'tree' as much as it can. The result
of this is that when a single source file is changed, only the metadata for
that file needs to be extracted again, and the rest is used from the cache
files. I also reduced the number of forked processes required to do the
metadata extraction; it was actually possible to do most of what we needed
in the Makefiles themselves without using any shell scripts at all! On my
laptop, these changes resulted in an 80% decrease in the time required
for the 'menuselect.makeopts' automatic check to occur after editing a single
source file.

While doing this work I also cleaned up a few minor things in the Makefiles,
adding a check for 'awk' to the configure script and changed all remaining
places we use 'grep' or 'awk' to use the ones found by the configure script,
and changed the 'prep_tarball' script to build the menuselect metadata so
that tarballs of Asterisk will include it and won't require the user to
wait while it is extracted after unpacking.


........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93184 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-17 07:25:35 +00:00
rizzo aa85540763 Put into Makefile.moddir_rules the common instructions used to
generate loadable and embedded module lists.

Individual Makefiles now are a lot simpler, possibly as simple as this:

    -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
    MODULE_PREFIX=cdr_
    all: _all
    include $(ASTTOPDIR)/Makefile.moddir_rules

and also more flexible because in a single directory we can combine
various types of modules (app_, cdr_, func_, ... ) by simply
listing them in the MODULE_PREFIX variable.

The individual Makefiles can also create list of modules to be
excluded by listing them in the variablel MODULE_EXCLUDE (see an
example in channels/Makefile).

With this change it becomes trivial to integrate a directory with
locally created/modified sources into the main build.




git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92082 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-10 03:50:38 +00:00
rizzo b50ce18fe8 normalize subdirs' Makefile by using ASTTOPDIR and not .. to reference
the top level directory.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92022 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-09 21:29:37 +00:00
kpfleming 0ba6df7e01 GNU make already knows how to quietly ignore non-existent files in 'include' directives
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@41209 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-26 23:58:47 +00:00
kpfleming 8b0c007ad9 merge new_loader_completion branch, including (at least):
- 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-08-21 02:11:39 +00:00
tilghman e63bd04ff0 Move curl version test to autoconf script
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37678 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-15 21:39:26 +00:00
kpfleming 51482ed964 more Makefile cleanup and consistency stuff
don't reuse LIBS variable from top-level Makefile (oops)
build Asterisk binary after subdirs (preparing for embedded modules)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37661 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-15 19:59:35 +00:00
kpfleming 84cc5e8bd0 move rules file to prepare for generic rules file
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37222 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-06 21:04:28 +00:00
kpfleming 673e53a328 use new (separate) dependencies file from menuselect
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35895 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-25 08:50:14 +00:00
kpfleming 41af2260b7 The Eurostar Commit! (it's amazing how much work you can get done on a 150 minute train ride from Paris to London <G>)
support the new location for zaptel.h and tonezone.h
use the dependency information output by menuselect to build Makefile rules for each module for header files and libraries
combine the common rules into a top-level Makefile.rules file
remove all (now) unnecessary stuff from subdir Makefiles
change translator API so that the newpvt() callback returns an int instead of a pointer (it no longer allocates memory)
alphabetize --with-<foo> options in configure script
enhance Net-SNMP support in configure script to provide a --with-netsnmp option
fix support for --with-pq so that if pg-config is not found when --with-pq is specified, an error will be generated
add 'optional package' usage to modules now that menuselect can output it
allow res_snmp to build by default, since the new loader changes coming soon will solve the function naming problem (and users can disable it via menuselect anyway)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35832 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-24 19:43:31 +00:00
russell c28707b6f1 remove various commands that remove old modules since they have been there a
sufficient amount of time.  Even if they happen to be still present, the main
Makefile will spit out a huge warning telling the user that modules not
installed by that run of "make install" are present in the modules directory.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35605 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-23 01:29:41 +00:00
russell 9b1d7f9fa8 - convert the 'uninstall' target to use separate targets to process each
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 15:38:13 +00:00
russell ddb0e59eb0 - specify that 'depend' is a .PHONY target
- 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 15:08:08 +00:00
russell 0bb78235cb - specify that 'all' is a .PHONY target
- 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-22 14:09:18 +00:00
russell b70a7c6a7c add the 'clean', 'clean-depend', and 'dist-clean' targets as .PHONY targets
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-22 11:27:03 +00:00
russell 31fff75d63 don't blow up in the sub Makefiles if menuselect.makeopts is not present. This
is valid in some cases, such as "make clean".


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@34738 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-19 00:14:16 +00:00
russell 745248fa58 remove the need to have to re-run make after a default menuselect.makeopts
file is generated.  This allows a fresh checkout of asterisk to be built
and installed with the standard "./configure && make && make install".


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32798 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-07 16:03:31 +00:00
kpfleming bb0b421ea8 use module names, not file names, in menuselect
work around XML parsing bug in menuselect for default sounds package


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32407 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-05 20:46:27 +00:00
kpfleming 29f496ef12 Thanks to the fine work of Russell Bryant and Dancho Lazarov, we now have autoconf and menuselect tools for Asterisk!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22267 f38db490-d61c-443f-a65b-d21fe96a405b
2006-04-24 17:11:45 +00:00
tilghman e7f4d1bd28 Sun's shell: just different enough to cause problems
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@11505 f38db490-d61c-443f-a65b-d21fe96a405b
2006-03-01 17:57:43 +00:00
tilghman c3f0ff1ef4 Bug 6619 - Fix Solaris issue with doubled [[
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@11478 f38db490-d61c-443f-a65b-d21fe96a405b
2006-03-01 06:15:35 +00:00
tilghman 4f1ce1ea49 Move conditional compilation for CURL from apps/ to funcs/
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@10961 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-23 23:43:06 +00:00
markster 6dacce7f24 Fix build issues...
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9988 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-14 19:08:12 +00:00
kpfleming e217105bfc ensure that dependencies are rebuilt after 'make update' so that builds don't break when files are removed/renamed
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9691 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-12 16:52:42 +00:00
kpfleming 32337b7e7f use auto-build for apps, simplify variable setting
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9564 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-11 17:12:05 +00:00
kpfleming dda3cfe4a0 use auto-build for res modules too
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9552 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-11 16:44:15 +00:00
kpfleming 7af82de9e9 prepare to use auto-build rules in other Makefiles
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9551 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-11 16:30:23 +00:00
kpfleming 801e0575cd remove last vestiges of pbx_functions
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9471 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-11 03:21:09 +00:00
kpfleming 5f90b9bebd build function modules independently (no more pbx_functions.so)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9469 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-11 03:14:05 +00:00
tilghman d36e97804d Bug 6322 - Implementation of SHA1 in Asterisk (plus dialplan function to use it)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9138 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-03 22:37:29 +00:00
mogorman 4ef13bdcda Allows for user to uninstall asterisk binaries
bug 6177


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9052 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-01 18:39:41 +00:00
oej 353cec56ea Reverting change in revision 8539 - fixed wrong problem. Sorry.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8548 f38db490-d61c-443f-a65b-d21fe96a405b
2006-01-24 17:47:41 +00:00
oej e5f9da6e43 Issue #6323, FreeBSD compatibility with compilation of func_odbc.c (reported by nulbyte)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8539 f38db490-d61c-443f-a65b-d21fe96a405b
2006-01-24 13:53:45 +00:00
russell a1447ba856 remove redundant CFLAGS for BSD which are already set in the main Makefile (issue #6250)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8101 f38db490-d61c-443f-a65b-d21fe96a405b
2006-01-16 17:51:35 +00:00
tilghman 9b9ed4da74 Fix indentation
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7929 f38db490-d61c-443f-a65b-d21fe96a405b
2006-01-10 03:23:38 +00:00
mogorman fab9f25c13 committing 5924 with minor white space changes
and adding it to the Makefile for functions.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7921 f38db490-d61c-443f-a65b-d21fe96a405b
2006-01-10 01:52:34 +00:00
tilghman e19e560da2 Bug 5327 - new function FILTER and optional argument to CALLERID
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7614 f38db490-d61c-443f-a65b-d21fe96a405b
2005-12-23 21:03:25 +00:00
kpfleming a30c7a43dc don't try to build func_odbc when ODBC headers/libraries are not present
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7589 f38db490-d61c-443f-a65b-d21fe96a405b
2005-12-22 03:49:41 +00:00
tilghman 4ca4b36d90 Bug 5055 - Simple SQL commands from the dialplan
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7576 f38db490-d61c-443f-a65b-d21fe96a405b
2005-12-21 18:43:10 +00:00
kpfleming 24c1e3c222 git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7221 f38db490-d61c-443f-a65b-d21fe96a405b 2005-11-29 18:24:39 +00:00
kpfleming 4d4023555b issue #4678
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6936 f38db490-d61c-443f-a65b-d21fe96a405b
2005-11-01 21:53:30 +00:00
kpfleming a4c24a32cf correct cygwin detection (issue #5328)
handle parallel make better (issue #5328)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6725 f38db490-d61c-443f-a65b-d21fe96a405b
2005-10-05 00:17:57 +00:00
kpfleming 475a3fdb24 clean up, use make functions instead of subshells, remove unused stuff
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6449 f38db490-d61c-443f-a65b-d21fe96a405b
2005-08-30 02:54:02 +00:00
russell 20ef59e571 add a dialplan function to get and set the music on hold class
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6115 f38db490-d61c-443f-a65b-d21fe96a405b
2005-07-12 22:50:45 +00:00
kpfleming e4c73c5b8d move tools used during build into build_tools subdirectory
clean up Makefile headers


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5942 f38db490-d61c-443f-a65b-d21fe96a405b
2005-06-20 17:26:08 +00:00
kpfleming f417b6d804 add MATH() dialplan function (bug #4473, with mods)
deprecate the Math() application


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5895 f38db490-d61c-443f-a65b-d21fe96a405b
2005-06-09 22:59:08 +00:00
kpfleming 025aeb8f62 add dialplan functions for Caller ID, language and timeouts (bug #4219, with mods)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5679 f38db490-d61c-443f-a65b-d21fe96a405b
2005-05-15 17:45:30 +00:00
markster f23e021126 Removed unnecessary strip (bug #4181)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5608 f38db490-d61c-443f-a65b-d21fe96a405b
2005-05-08 18:11:55 +00:00
markster 9eeaaa3915 Convert app_db to function variables (bug #4201)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5604 f38db490-d61c-443f-a65b-d21fe96a405b
2005-05-08 17:08:25 +00:00
markster 16b0b362a3 Build as a single executable, work around Makefile issue
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5590 f38db490-d61c-443f-a65b-d21fe96a405b
2005-05-05 17:39:18 +00:00