Commit Graph

485 Commits

Author SHA1 Message Date
David Vossel
3cb482a4a6 fixes parsing error in Makefile.
Some echo lines were missing "; . Thanks to jparker for pointing out
the problem. 



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@241626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-20 20:00:04 +00:00
Jason Parker
0b536b5632 Allow parallel make (-j) to work properly.
1.4 changes are quite different from the others.

(issue #16489)
Reported by: Chainsaw
Tested by: qwell


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@241228 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-19 17:41:00 +00:00
David Vossel
7e7e6da09e updated transmit_silence option documentation in asterisk.conf
This patch updates the transmit_silence option to better document
why the option exists, and what it affects.  Thanks to russell
for providing the verbage for this update.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@240891 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-18 16:51:35 +00:00
Russell Bryant
e2a237c4a5 Fix a spelling error in the asterisk.conf sample.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@240547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-15 23:06:11 +00:00
David Vossel
6c6a857e1c add silence gen to wait apps
asterisk.conf's 'transmit_silence' option existed before
this patch, but was limited to only generating silence
while recording and sending DTMF. Now enabling the
transmit_silence option generates silence during wait
times as well.
  
To achieve this, ast_safe_sleep has been modified to
generate silence anytime no other generators are present
and transmit_silence is enabled. Wait apps not using
ast_safe_sleep now generate silence when transmit_silence
is enabled as well.

(closes issue 0016524)
Reported by: kobaz

(closes issue 0016523)
Reported by: kobaz
Tested by: dvossel
  
Review: https://reviewboard.asterisk.org/r/456/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@239718 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-01-13 17:16:12 +00:00
Jason Parker
cda2ce4d60 Fix unselecting of menuselect options via GLOBAL_MAKEOPTS and USER_MAKEOPTS.
(closes issue #16296)
Reported by: abelbeck
Patches:
      issue16296-20091210.diff uploaded by qwell (license 4)
(abelbeck described a fix, which I expanded upon)
Tested by: abelbeck, qwell, lmadsen


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@234255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-12-10 20:58:09 +00:00
Kevin P. Fleming
d3f44108f1 Don't force menuselect.makeopts to be rebuilt on every build.
For some reason the menuselect.makeopts file was listed as PHONY in the Makefile,
resulting in 'make' needing to rebuild it for every build. This then resulted in
the embedded module rules being rebuilt on every build, which can be slow and is
unnecessary.

This patch fixes the problem by properly allowing 'make' to know when the
menuselect.makeopts file needs to be rebuilt (defining the proper dependencies).


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@225581 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-10-23 14:00:01 +00:00
Sean Bright
0b21ae08e1 Resolve parallel build warnings.
Reported by Klaus Darilion on the asterisk-dev mailing list.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@220213 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-24 18:18:18 +00:00
Sean Bright
e8544f5919 Remove the remaining bashisms in the Makefile/mkpkgconfig
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@220099 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-24 14:41:57 +00:00
Tilghman Lesher
679cefec98 Use the default runlevels for Debian derivatives, instead of making up our own.
(closes issue #14730)
 Reported by: pkempgen


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@213899 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-08-25 02:40:22 +00:00
Kevin P. Fleming
22140c486f Eliminate spurious compiler warnings from system headers on *BSD platforms.
Ensure that system headers located in /usr/local/include are actually treated
as system headers by the compiler, and not as local headers which are subject
to warnings from the -Wundef compiler option and others.

(closes issue #15606)
Reported by: mvanbaak



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@210237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-08-04 14:51:39 +00:00
Kevin P. Fleming
75f1eaf2a1 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: https://origsvn.digium.com/svn/asterisk/branches/1.4@207647 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-07-21 13:04:44 +00:00
Sean Bright
a34f50f08b Backport fix for parallel build warnings from trunk r199781.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@200185 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-11 22:20:31 +00:00
Sean Bright
be8d983874 Fix 'make config' target for Slackware.
There was a missing semi-colon after the echo statement in the Makefile that was
causing problems for some users.  Fix suggested by reporter.

(closes issue #15225)
Reported by: pdavis


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@197998 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-29 18:14:12 +00:00
Sean Bright
ad4de8c79c Use bash explicitly when calling build_tools/mkpkgconfig from the Makefile.
Since we use bashisms in build_tools/mkpkgconfig, we should call on bash
explicitly when running from the Makefile, otherwise we get errors during a
'make install.'

(closes issue #15209)
Reported by: seandarcy


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@197264 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-27 20:12:06 +00:00
Kevin P. Fleming
50515ed372 update dev-mode compiler flags to match the ones used by default on Ubuntu Intrepid, so all developers will see the same warnings and errors
since this branch already had some printf format attributes, enable checking for them and tag functions that didn't have them

format attributes in a consistent way



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@159808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-29 16:58:29 +00:00
Kevin P. Fleming
9bfbfb5496 when an individual directory dist-clean is run, run clean in that directory first, and when running top-level dist-clean, do not run subdirectory clean operations twice
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@157163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-15 19:31:03 +00:00
Kevin P. Fleming
5c7f06103d on Ubuntu (at least), recent versions of ld in binutils delete all debugging symbols when -x is supplied; since the reasons why -x is being passed are lost in the mists of time, remove it so debugging will work properly
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@148736 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 10:30:54 +00:00
Kevin P. Fleming
50a28e9853 improve header inclusion process in a few small ways:
- it is no longer necessary to forcibly include asterisk/autoconfig.h; every module already includes asterisk.h as its first header (even before system headers), which serves the same purpose
  - astmm.h is now included by asterisk.h when needed, instead of being forced by the Makefile; this means external modules will build properly against installed headers with MALLOC_DEBUG enabled
  - simplify the usage of some of these headers in the AEL-related stuff in the utils directory


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@144924 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-27 15:00:48 +00:00
Jason Parker
c2eee2c415 Remove RPM package targets from Makefile (and all associated parts).
This has never worked in 1.4, and we decided that it makes no sense to be done here.
There are many distros out there that already have "proper" spec files that can be (re)used.

Closes issue #13113
Closes issue #10950
Closes issue #10952


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@141741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-08 20:15:42 +00:00
Terry Wilson
a418df6432 sounds/Makefile installs sounds using the "new" language directory structure, but languageprefix needs to be set = yes for sounds in subdirectories (digits/1, etc.) to play as the correct language.
Fix the generation of asterisk.conf to include languageprefix=yes


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@140050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 15:22:58 +00:00
Kevin P. Fleming
b9b6f29610 remove config.cache during distclean, in case the user is using autoconf caching
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@136404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-07 15:07:12 +00:00
Russell Bryant
2ec4a1b050 Remove the use of --no-print-directory when compiling subdirectories.
This allows vim :make functionality to work properly when errors have
occurred in the build.  Without printing the directories, vim did not
know how to find the file that the error occurred in.

If the extra bit of build noise annoys anyone, just let me know, and
I'll make this optional.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@136168 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-06 18:58:37 +00:00
Kevin P. Fleming
ced15f2814 use the proper method for building version.h
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@134352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 15:29:17 +00:00
Kevin P. Fleming
17c5dbc3a5 forcibly remove the modules that are changing names
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@130317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-11 22:23:29 +00:00
Kevin P. Fleming
75c6f9ab0f a whole pile of Zaptel/DAHDI compatibility work, with lots more to come... this tree is not yet ready for users to be easily upgrading or switching, but it needs to be :-)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@130298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-11 22:12:26 +00:00
Kevin P. Fleming
0e91ad574f a couple of small Solaris-related fixes
(closes issue #11885)
Reported by: snuffy, asgaroth



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@127892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-03 22:18:38 +00:00
Tilghman Lesher
732e3bec3e Reverse order, such that user configs override default selections
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@115312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-05-05 20:17:55 +00:00
Russell Bryant
992264a77f ensure directories are created before we try to install stuff into them
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@114278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-18 20:01:09 +00:00
Russell Bryant
87aea83bdc SUBDIRS_INSTALL is already listed as a subtarget for bininstall
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@114275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-18 19:58:55 +00:00
Russell Bryant
afdcdafb2b Fix the bininstall target to install from subdirs, as well.
(closes issue AST-8, patch from bmd at switchvox)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@114204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-17 16:23:45 +00:00
Joshua Colp
be84adc952 Add an option (transmit_silence) which transmits silence during both Record() and DTMF generation. The reason this is an option is that in order to transmit silence we have to setup a translation path. This may not be needed/wanted in all cases.
(closes issue #10058)
Reported by: tracinet


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@110628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-25 14:37:35 +00:00
Jason Parker
5bc2c923e2 People report bugs about Asterisk crashing with DO_CRASH enabled was getting a little silly...
Now we only show certain cflags when you run configure with --enable-dev-mode
(corresponding menuselect change to follow)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@109973 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-19 17:12:52 +00:00
Jason Parker
5996d4e4bb Add badshell to .PHONY target (thanks Kevin)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@104141 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-26 18:26:12 +00:00
Jason Parker
3d6b98b1ca Since all shells aren't as awesome as bash, we have to fail if somebody tries to use a literal "~" in DESTDIR.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@104139 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-26 18:09:13 +00:00
Russell Bryant
2f4510988c Use GNU make magic instead of shell magic to escape spaces in the working directory.
(related to issue #11834)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@100922 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-29 17:21:33 +00:00
Russell Bryant
c8b0628cc7 Fix building Asterisk when the working path has spaces in it.
(closes issue #11834)
Reported by: spendergrass
Patched by: me


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@100882 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-29 17:06:43 +00:00
Russell Bryant
a4523fcd83 List include/asterisk/version.h as a .PHONY target because we want the commands
listed for this target to be executed regardless of whether the file exists or
not.  This fixes having the version not up to date when running from svn.
(closes issue #11619, reported by plack, fixed by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@94789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-26 17:00:03 +00:00
Kevin P. Fleming
627f595c58 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: https://origsvn.digium.com/svn/asterisk/branches/1.4@93180 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-17 06:44:51 +00:00
Tilghman Lesher
92d1018c2a Start Asterisk in Debian at a more reasonable time (since zaptel is at level 20)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@89302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-15 18:37:38 +00:00
Tilghman Lesher
ad17919cd8 Create samples for ALL of the available options in asterisk.conf
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@87852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-31 18:03:53 +00:00
Kevin P. Fleming
bb778cb3b9 don't put '-pipe' into ASTCFLAGS if '-save-temps' is already there (used when debugging preprocessor issues) because the compiler will whine about each compile command
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@87460 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-29 22:04:29 +00:00
Jason Parker
1e9e35c081 Correct documentation. I removed the wrong line..
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@86406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-18 22:01:02 +00:00
Jason Parker
7c84082d13 Add documentation for options in asterisk.conf
Issue 11029, patch by eserra


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@86405 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-18 21:58:44 +00:00
Jason Parker
eb9c632b90 Properly use DESTDIR in 'config' target.
Do not try to run chkconfig or similar if using DESTDIR.

Issue 10938, patch by cabal95.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@85684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-15 20:15:51 +00:00
Russell Bryant
d3beef4b59 * Don't build the menuselect-tree for the tarball, as it requires running the
configure script first
* Change the Makefile to note that menuselect-tree depends on the configure
  script.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@84474 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-02 20:06:07 +00:00
Jason Parker
cf8f092d98 Add dist-clean support for subdirs.
Change h323 to only remove the Makefile on a dist-clean, rather than a clean.

This fixes a bug I found with trying to run make after a make clean


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@84291 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-01 21:52:45 +00:00
Jason Parker
cd304a0a76 We added COPTS for ASTCFLAGS additions, but not LDOPTS for ASTLDFLAGS. This adds LDOPTS
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81826 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-06 22:05:02 +00:00
Jason Parker
9b23ab95aa Fix a few build issues in Solaris (and likely others).
Use GREP and ID variables from autoconf.

Reported to me in #asterisk-dev
I forgot who reported this - sorry. :(


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@80330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 18:53:18 +00:00
Jason Parker
a7583cd240 Change a syntax that the GNU make in Solaris dislikes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@80304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 18:25:34 +00:00