61056be5ab
Merged revisions 46093 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r46093 | russell | 2006-10-24 01:23:33 -0400 (Tue, 24 Oct 2006) | 3 lines
Restore the ability to remove the firmware directory without causing the
installation to fail (issue #8111 )
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46094 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-24 05:24:32 +00:00
e85da9be41
Let's have build.h created a bit earlier so that func_version can use it and not stop the build on a fresh machine that has never had Asterisk installed on it before...
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45847 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-22 04:44:43 +00:00
63f236445e
Merged revisions 45775 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r45775 | file | 2006-10-20 15:03:03 -0400 (Fri, 20 Oct 2006) | 2 lines
Pass DESTDIR and ASTSBINDIR so that the utilities get installed in the proper location (reported on asterisk-dev mailing list)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-20 19:04:23 +00:00
886059d111
Merged revisions 44942 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44942 | file | 2006-10-12 12:08:50 -0400 (Thu, 12 Oct 2006) | 2 lines
Pass off AUDIO_LIBS so muted can link on OSX (issue #8135 reported by ssokol)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44943 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-12 16:11:32 +00:00
d3f886fb14
put linker flags in ASTLDFLAGS where they belong
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04 22:51:17 +00:00
41eb95e055
Merged revisions 44322 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44322 | kpfleming | 2006-10-03 19:25:44 -0500 (Tue, 03 Oct 2006) | 3 lines
ensure that local include files are always used
avoid a duplicate function name (term_init())
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04 00:26:21 +00:00
f2fb8e6f79
Merged revisions 44125 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44125 | russell | 2006-10-01 14:30:06 -0400 (Sun, 01 Oct 2006) | 6 lines
Fix a problem that cuased AST_DATA_DIR in defaults.h to be empty. The cause is
that since ASTDATADIR is explicitly exported using "export ASTDATADIR" at the
top of the Makefile, make no longer considers the variable "undefined", so the
Makefile can't use ?= to set ASTDATADIR if not yet set.
(issue #8063 , reported by akohlsmith, fixed by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-01 18:30:42 +00:00
8d6d166b14
merge compile fixes from 44080:
...
- with AST_DEVMODE, building codecs/lpc10 fails because of lots
of warnings, and the configure step in editline fails as well.
Fix this by removing the -Werror in these steps.
- on FreeBSD (but probably on other platforms as well), the final
link of asterisk fails because AST_LIBS was not exported to the
subdirs Makefiles. Add a proper fix in the top-level Makefile
(a possible alternative way is to add "export AST_LIBS" near
the beginning of the file).
With this fix, i believe that some of the platform-specific
conditionals in main/Makefile are redundant (because they should
be already dealt with in the top level Makefile) but i don't
have a platform to check.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-30 16:37:21 +00:00
89050169c8
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: https://origsvn.digium.com/svn/asterisk/trunk@44013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-29 18:54:21 +00:00
ea6e34b530
Merged revisions 43993 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43993 | kpfleming | 2006-09-29 11:38:27 -0500 (Fri, 29 Sep 2006) | 2 lines
a couple more environment settings that can't leak into the menuselect build
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-29 16:38:46 +00:00
e796af37f1
Merged revisions 43524 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43524 | kpfleming | 2006-09-22 18:44:47 -0500 (Fri, 22 Sep 2006) | 2 lines
don't output the 'build complete' message when the target being run is already going to do an installation
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43525 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-22 23:45:14 +00:00
1485fa4c24
move this header to include where it belongs
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-19 21:48:57 +00:00
2cc96500bd
Mergeing in Paul Cadach's chan_h323 changes *holds breath*
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-19 17:07:22 +00:00
23def858f7
We have autoconf...let's actually use it.
...
(note, M4 wasn't used, so...bye)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43215 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-18 19:57:09 +00:00
be29512d1e
more makefile tweaks to keep targets from being run when they don't need to be
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-09 03:27:21 +00:00
3f189742f6
make menuselect configure process be silent when possible
...
don't use #ifdef inside a macro call... it appears various versions of gcc have bugs related to this
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-29 23:33:59 +00:00
3ba8e0a973
ensure that cross-compiler info is removed from the enviroment before configuring menuselect
...
ensure that the user's LDFLAGS take precedence when linking the final binary
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-26 17:05:38 +00:00
b374245688
remove some unneeded variables now that the menuselect build is isolated from
...
the parent project
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41165 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-26 16:13:45 +00:00
379dc24745
we really need BSD make here to understand the -V option.
...
Fix and document this.
(problem introduced in SVN 40753)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-25 20:10:56 +00:00
5266cd75e3
remove CFLAGS that aren't needed anymore
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-24 18:57:46 +00:00
2986a59fab
Okay, there are 3 reasons why I'm doing this.
...
1) Solaris sed doesn't have -r, which means things like \s and \S don't work.
2) GNU sed version 4.1.2 failed on a very simple test
echo "Test Test" | sed -r -e 's/\s/x/g'
should have returned "TestxxxTest", but did not (however, 4.1.4 did?).
3) The CFLAGS were never set, so that entire line actually did nothing. Now it's useful again.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40964 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-24 01:21:41 +00:00
4c41a6ccd0
merge menuselect_build ... most of the changes happened in menuselect
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40877 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-23 03:07:34 +00:00
0264c362b6
a couple Solaris tweaks, to help build properly.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-22 05:24:50 +00:00
a87f710062
oops... missed one
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 20:19:47 +00:00
90b0c32c71
another variable to clear out before configuring mxml
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 20:18:36 +00:00
ff74cbc116
replace a couple of bare 'make' with $(MAKE)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40765 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 13:47:45 +00:00
e044e852c6
ensure that 'make' after 'svn update' that includes a configure script change won't run without making the user run configure first
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 03:58:02 +00:00
b1288df748
document Makefile target changes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40728 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 02:54:05 +00:00
ca6ee66c60
main subdirectory is not dependencies for menuselect input
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40725 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 02:31:01 +00:00
0a27d8bfe5
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: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 02:11:39 +00:00
60cf653dde
kpfleming didn't break trunk, it was the aliens. (fix it so that the Makefile references the new name for the XML tree, menuselect-tree)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-20 01:42:41 +00:00
781f9dbcaf
don't include files that cause additional targets to get executed if the target
...
called was clean, distclean, or update
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39640 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-14 02:00:28 +00:00
9dac8f0f09
add menuselect_stub.c to deps list
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38000 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-19 21:52:59 +00:00
a077853b17
add comments on what special variables are for
...
put library path into proper variable for *BSD
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37670 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-15 20:12:28 +00:00
000ba592b2
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: https://origsvn.digium.com/svn/asterisk/trunk@37661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-15 19:59:35 +00:00
396ef6f9e7
use LDFLAGS and LIBS properly, and allow dependencies to provide LDFLAGS if needed (although none do today)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-15 16:40:05 +00:00
d739107ce1
revert this change for now since it isn't working correctly and there are more
...
important issues to work on at the moment ...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-12 20:27:46 +00:00
407c91a043
add "update" to the list of targets to ignore various included files for and
...
check the targets in a little bit different way
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-12 19:48:22 +00:00
90098fa198
don't let make run configure or menuselect if the target is either
...
"clean" or "distclean"
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-12 19:36:42 +00:00
6ff11745ef
remove the use of -Wno-pointer-sign. Asterisk now builds without any of these
...
warnings present on my machine.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-07 16:22:32 +00:00
b601ff0a3e
small cleanup
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-07 02:33:24 +00:00
bc9ed9f5c4
various minor fixes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37277 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-07 00:48:40 +00:00
0b91c08045
dirty hack of a fix to deal with the fact that chan_vpb changed to chan_vpb.cc
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37276 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-06 23:51:15 +00:00
4f826452cf
make the build output less noisy (optional, can be controlled by the NOISY_BUILD variable in the top-level Makefile)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-06 23:18:45 +00:00
748431f7b6
move rules file to prepare for generic rules file
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37222 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-06 21:04:28 +00:00
f54bef6dff
fix removing autoconfig.h on distclean (issue #7439 , casper)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-01 14:29:06 +00:00
9bc3976204
swap distclean and dist-clean, since distclean is more commonly used ...
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36502 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-01 14:25:43 +00:00
5dceb817e6
remove build_tools/menuselelct-deps on distclean
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-01 04:37:52 +00:00
b2f5334746
don't specify this include in the menuselect Makefile, because asterisk-addons
...
doesn't have an include dir
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36464 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-01 03:27:37 +00:00
eba0e6731f
more pickyness
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36463 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-01 03:23:18 +00:00
Russell Bryant
Joshua Colp
Luigi Rizzo
Kevin P. Fleming
Matthew Fredrickson
Jason Parker