Archived
14
0
Fork 0
Commit graph

62 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
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
50c6c0be43 move FreeTDS version check into configure script
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@36255 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-29 07:50:01 +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
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
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
e0162250d9 Add support for logging CDR recrods to a radius server (issue #6639, phsultan)
- with contributions from miconda, jcollie, and sb
 - branch maintained by oej
Thanks everyone!


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@29094 f38db490-d61c-443f-a65b-d21fe96a405b
2006-05-20 22:30:05 +00:00
kpfleming
fd0fef45bf Merged revisions 23673 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r23673 | kpfleming | 2006-04-30 09:27:56 -0500 (Sun, 30 Apr 2006) | 2 lines

allow top-level OPTIMIZE setting to affect builds in these subdirectories too

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@23674 f38db490-d61c-443f-a65b-d21fe96a405b
2006-04-30 14:28:25 +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
markster
3cbcc04947 Fix CDR builds when includes are in freetds directory off include
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22232 f38db490-d61c-443f-a65b-d21fe96a405b
2006-04-24 03:40:12 +00:00
rizzo
6f8879d20d remove duplicate CFLAGS and SOLINK definitions that are
already in the top level Makefile



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@14351 f38db490-d61c-443f-a65b-d21fe96a405b
2006-03-23 13:39:36 +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
2cafc00736 use auto-build for cdr modules
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9565 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-11 17:24:44 +00:00
tilghman
54a33238cc Merged revisions 9233 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r9233 | tilghman | 2006-02-08 16:34:38 -0600 (Wed, 08 Feb 2006) | 2 lines

Leave it to RH/CentOS to put the freetds headers in a completely nonstandard location.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9238 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-08 23:10:39 +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
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
markster
21e4d8c4ed fix bsd compile issue (bug #5731)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7094 f38db490-d61c-443f-a65b-d21fe96a405b
2005-11-14 00:45:07 +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
markster
caeca15f95 Merge TDS cdr fixes (bug #5517, with slight mods)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6892 f38db490-d61c-443f-a65b-d21fe96a405b
2005-10-29 18:49:25 +00:00
kpfleming
410e2e9c48 fix cdr_pgsql build on Debian testing (issue #5064)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6453 f38db490-d61c-443f-a65b-d21fe96a405b
2005-08-30 15:59:25 +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
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
bafda2c23c Add custom CDR (bug #3595)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5253 f38db490-d61c-443f-a65b-d21fe96a405b
2005-03-24 21:57:42 +00:00
markster
4d4a7c00d7 More Asterisk sparc patches (courtesy Belgarath)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3693 f38db490-d61c-443f-a65b-d21fe96a405b
2004-08-31 16:33:00 +00:00
markster
2974f32e4f Add Manager CDR (off by default) (bug #2127) courtesy cybershield
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3509 f38db490-d61c-443f-a65b-d21fe96a405b
2004-07-25 14:56:34 +00:00
markster
8a7be2ce2a Ad MSSQL CDR support (bug #1859)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3497 f38db490-d61c-443f-a65b-d21fe96a405b
2004-07-23 17:34:57 +00:00
markster
5e3342d3b3 Add SQLite CDR support (bug #1986)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3390 f38db490-d61c-443f-a65b-d21fe96a405b
2004-07-08 08:29:26 +00:00
markster
bc5de50bc9 More BSD compile fixes (bugs #1754 and #1756)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3121 f38db490-d61c-443f-a65b-d21fe96a405b
2004-05-31 19:40:23 +00:00
markster
32048c18cd Create individual sip reload command (bug #880)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2062 f38db490-d61c-443f-a65b-d21fe96a405b
2004-01-23 15:43:31 +00:00
markster
afc3b69866 Remove /usr/include from path??
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1952 f38db490-d61c-443f-a65b-d21fe96a405b
2004-01-11 19:17:02 +00:00
malcolmd
46cbc15f62 Silly cdr_pgsql.so error
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1901 f38db490-d61c-443f-a65b-d21fe96a405b
2004-01-08 00:06:35 +00:00
malcolmd
a4095fe5e0 Fix for cdr_pgsql for Debian per Bug #609
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1899 f38db490-d61c-443f-a65b-d21fe96a405b
2004-01-07 23:48:22 +00:00
jeremy
0dc1d6801f check another possible location for unix-odbc install. Bug #727
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1885 f38db490-d61c-443f-a65b-d21fe96a405b
2003-12-28 20:13:29 +00:00
markster
47b2f7c5d1 Rename cdr_unixodbc to cdr_odbc
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1834 f38db490-d61c-443f-a65b-d21fe96a405b
2003-12-06 23:19:22 +00:00
markster
b46cd20c07 Merge BK's unix ODBC driver
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1809 f38db490-d61c-443f-a65b-d21fe96a405b
2003-12-02 00:21:53 +00:00
jeremy
f642820668 This is for postgres, not mysql now. (it was buggin me)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1683 f38db490-d61c-443f-a65b-d21fe96a405b
2003-11-01 11:26:28 +00:00
markster
f9db8abd4d Make it build and run on MacOS X
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1673 f38db490-d61c-443f-a65b-d21fe96a405b
2003-10-26 18:50:49 +00:00