Archived
14
0
Fork 0
Commit graph

53 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
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
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
rizzo
ea7a4e7d71 remove traces of previously merged files
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@17865 f38db490-d61c-443f-a65b-d21fe96a405b
2006-04-06 15:43:06 +00:00
rizzo
0a1c1c5ec2 ogg_vorbis now compiles so put it back in.
On passing, remove an unnecessary initializazion in format_sln.c



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@17285 f38db490-d61c-443f-a65b-d21fe96a405b
2006-04-04 15:40:47 +00:00
rizzo
215411b450 temporarily disconnect ogg_vorbis from the build while i update it
(should be a matter of a couple of hours).



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@17265 f38db490-d61c-443f-a65b-d21fe96a405b
2006-04-04 14:39:22 +00:00
rizzo
217ea2f1ea Largely simplify format handlers (for file copy etc.)
collecting common functions in a single place and removing
them from the individual handlers.
The full description is on mantis,
http://bugs.digium.com/view.php?id=6375
and only the ogg_vorbis handler needs to be converted to
the new structure.

As a result of this change, format_au.c and format_pcm_alaw.c
should go away (in a separate commit) as their functionality
(trivial) has been merged in another file.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@17243 f38db490-d61c-443f-a65b-d21fe96a405b
2006-04-04 12:59:25 +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
kpfleming
28a949808b use auto-build for formats
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9567 f38db490-d61c-443f-a65b-d21fe96a405b
2006-02-11 17:43:54 +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
markster
d1d90f47fd Add support for H.264 with SIP and recording
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7855 f38db490-d61c-443f-a65b-d21fe96a405b
2006-01-07 17:54:22 +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
c8ececdd93 add OGG/Vorbis file format support (bug #4296)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6173 f38db490-d61c-443f-a65b-d21fe96a405b
2005-07-20 00:25:54 +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
025c3f4d6b add support for Sun Microsystems AU audio format (bug #4428 with minor mods)
remove hardcoded format list from app_record help text


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5837 f38db490-d61c-443f-a65b-d21fe96a405b
2005-06-03 21:52:00 +00:00
markster
5c8b9494eb Mildly resurect G.723.1 file format
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4583 f38db490-d61c-443f-a65b-d21fe96a405b
2004-12-29 12:12:59 +00:00
markster
4ccdd569ff Add Anthony's format_sln (bug #2381)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3726 f38db490-d61c-443f-a65b-d21fe96a405b
2004-09-05 18:00:55 +00:00
markster
71dc0921ba Fix iLBC with valgrind, add iLBC format from bkw_
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2740 f38db490-d61c-443f-a65b-d21fe96a405b
2004-04-22 03:34:13 +00:00
markster
89256e9e9f Add G.726, revise Changelog
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2260 f38db490-d61c-443f-a65b-d21fe96a405b
2004-02-27 05:16:26 +00:00
markster
f8c39a08f6 Remove really broke MP3 stuff in favor of G.726 in the near future
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1689 f38db490-d61c-443f-a65b-d21fe96a405b
2003-11-04 02:40:09 +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
markster
54aafb9953 Add DESTDIR support (bug #200)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1664 f38db490-d61c-443f-a65b-d21fe96a405b
2003-10-25 17:27:53 +00:00
markster
1a38832878 depend stuff
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1375 f38db490-d61c-443f-a65b-d21fe96a405b
2003-08-19 16:42:30 +00:00
markster
6a9e0210bb Add H.263 video support
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1131 f38db490-d61c-443f-a65b-d21fe96a405b
2003-06-29 03:24:39 +00:00
markster
3a0233e8ed Totally redo file formats
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1130 f38db490-d61c-443f-a65b-d21fe96a405b
2003-06-28 22:50:47 +00:00
markster
f36b76d24a dep fix, pbx fix
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@962 f38db490-d61c-443f-a65b-d21fe96a405b
2003-05-06 00:00:20 +00:00
markster
0aca2c116c More BSD enhancements
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@916 f38db490-d61c-443f-a65b-d21fe96a405b
2003-04-27 18:13:11 +00:00
markster
4fb4f1a6be Add Mahmut's Alaw patch
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@672 f38db490-d61c-443f-a65b-d21fe96a405b
2003-03-21 04:25:13 +00:00
markster
151774c059 Version 0.3.0 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@599 f38db490-d61c-443f-a65b-d21fe96a405b
2003-02-04 02:43:17 +00:00
markster
3f668a0121 Version 0.1.9 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@325 f38db490-d61c-443f-a65b-d21fe96a405b
2001-05-26 17:39:42 +00:00
markster
367ab44ef1 Version 0.1.8 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@303 f38db490-d61c-443f-a65b-d21fe96a405b
2001-04-27 03:04:43 +00:00