dect
/
asterisk
Archived
13
0
Fork 0
Commit Graph

61 Commits

Author SHA1 Message Date
tilghman 8b4dc27865 Merged revisions 242520 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r242520 | tilghman | 2010-01-24 00:33:01 -0600 (Sun, 24 Jan 2010) | 8 lines
  
  Only rebuild bison and flex source files on demand, if bison and flex are detected by the configure script.
  
  Changed after discussion on the -dev list about possible unnecessary build
  failures, due to checkouts/untars causing these special source files to
  possibly be newer than their resulting C files.  This should additionally
  ensure that nobody need learn about extra Makefile arguments to ensure the
  proper files get rebuilt when changes are made to these special source files.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@242521 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-24 06:40:31 +00:00
kpfleming 3dbaf0de9a Merged revisions 207647 via svnmerge from
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-07-21 13:28:04 +00:00
kpfleming 89ca122df3 Merged revisions 157859 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r157859 | kpfleming | 2008-11-19 15:34:47 -0600 (Wed, 19 Nov 2008) | 7 lines
  
  the gcc optimizer frequently finds broken code (use of uninitalized variables, unreachable code, etc.), which is good. however, developers usually compile with the optimizer turned off, because if they need to debug the resulting code, optimized code makes that process very difficult. this means that we get code changes committed that weren't adequately checked over for these sorts of problems.
  
  with this build system change, if (and only if) --enable-dev-mode was used and DONT_OPTIMIZE is turned on, when a source file is compiled it will actually be preprocessed (into a .i or .ii file), then compiled once with optimization (with the result sent to /dev/null) and again without optimization (but only if the first compile succeeded, of course).
  
  while making these changes, i did some cleanup work in Makefile.rules to move commonly-used combinations of flag variables into their own variables, to make the file easier to read and maintain
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@157974 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-20 00:08:12 +00:00
kpfleming 902b5c3e00 various minor fixes created while i worked on getting *every* Asterisk module to build on laptop in dev mode:
remove weird pre-setting of LUA paths; they are not necessary; also use the proper path for including the files in pbx_lua.c

add searching for OpenAIS libraries in /usr/lib/openais if a path is not specified; not sure if this is really the optimal solution, but it works

make the compiler shut up about some ignored function results in pbx_gtkconsole; this module is badly coded anyway



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@126356 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-29 16:19:29 +00:00
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
rizzo 03ef197f9e Fix building of modules under cygwin.
After this commit we can actually load modules under windows,
and we can start debugging more interesting problems related
to the load order and functionality of modules.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89454 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-20 16:12:10 +00:00
murf e897b4499e This commit closes bug 7605, and half-closes 7638. The AEL code has been 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-08-15 19:21:27 +00:00
murf 1de82b08fc Merged revisions 67526 via svnmerge from
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-06-05 22:04:22 +00:00
kpfleming a8442c9b22 Merged revisions 44055 via svnmerge from
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-29 22:48:43 +00:00
kpfleming 170dae49be Merged revisions 43996-43997,44008,44011-44012 via svnmerge from
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-29 18:54:21 +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
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 98ae1f3092 various minor fixes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37277 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-07 00:48:40 +00:00
kpfleming e319f5334e make the build output less noisy (optional, can be controlled by the 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-07-06 23:18:45 +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
russell f2629806ef fix pbx_dundi build (issue #7424, jstrom)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35875 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-25 01:25:52 +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 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 c521e83995 remove "depend" from the "all" targets in sub Makefiles. The main Makefile
already calls "make depend" for each of the subdirectories


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@34497 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-16 16:54:00 +00:00
kpfleming 926f67f682 various minor portability fixes (mostly from tholo for OpenBSD)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@33350 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-09 20:26:25 +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
russell 379b206f6b on a clean, we have to clean out the ael directory too
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@29731 f38db490-d61c-443f-a65b-d21fe96a405b
2006-05-23 17:09:51 +00:00
kpfleming 7313590690 simplify CFLAGS handling for subdirectories
don't put paths into the include search path when they are not needed
don't auto-rebuild the AEL bison/flex output based on make dependencies (the generated files are already checked in, and the timestamps generated by a checkout will usually cause them to be overwritten)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@23582 f38db490-d61c-443f-a65b-d21fe96a405b
2006-04-30 11:40:06 +00:00
kpfleming 74df229c6c don't rely on default search paths for finding local include files
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22438 f38db490-d61c-443f-a65b-d21fe96a405b
2006-04-25 18:29:02 +00:00
kpfleming 6baa8fbab8 Merge Steve Murphy's (murf) complete re-implementation of AEL, which is now no longer considered experimental :-)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22273 f38db490-d61c-443f-a65b-d21fe96a405b
2006-04-24 17:41: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
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 64cdc6493a use auto-build for pbx modules
correct install variable for format modules


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9568 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-11 17:48:44 +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
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
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 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
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
markster 20cc8387a9 Add Asterisk Extension Language support (AEL) from Astricon talk
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5918 f38db490-d61c-443f-a65b-d21fe96a405b
2005-06-16 08:47:06 +00:00
kpfleming 27b7a4d452 remove obsolete module (still available in CVS history if needed) (inspired by bug #4127)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5581 f38db490-d61c-443f-a65b-d21fe96a405b
2005-05-05 01:03:24 +00:00
markster 72fc19e07f Fix cross compiling (bug #3868)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5278 f38db490-d61c-443f-a65b-d21fe96a405b
2005-03-27 22:39:17 +00:00
markster d8551ca4e2 Add first pass at realtime
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4309 f38db490-d61c-443f-a65b-d21fe96a405b
2004-11-22 03:25:27 +00:00
markster 5cb692d65f Add "Loopback" switch
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4070 f38db490-d61c-443f-a65b-d21fe96a405b
2004-10-24 02:53:24 +00:00
markster 852e93e07c Add DUNDi.... (http://www.dundi.com)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4033 f38db490-d61c-443f-a65b-d21fe96a405b
2004-10-18 21:45:13 +00:00
markster 962ca7b4a3 Don't build GTK console by default
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3966 f38db490-d61c-443f-a65b-d21fe96a405b
2004-10-09 21:04:31 +00:00