Commit Graph

415 Commits

Author SHA1 Message Date
Kevin P. Fleming 2d1e6ff221 Merged revisions 49282 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49282 | kpfleming | 2007-01-02 21:21:25 -0600 (Tue, 02 Jan 2007) | 2 lines

various Makefile improvements to get chan_vpb (and any other C++ modules) to build properly

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-03 03:28:12 +00:00
Kevin P. Fleming 887a2de2b4 GNU make already knows what the current directory is, there is no need to use 'pwd'
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49101 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-01 22:59:01 +00:00
Kevin P. Fleming 9ebe6679a2 Merged revisions 49098-49099 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49098 | kpfleming | 2007-01-01 16:08:24 -0600 (Mon, 01 Jan 2007) | 2 lines

revert this change until a better solution can be found... 'env -i' was not being used properly, but even when changed to do so, this process fails during cross-compilation because the menuselect build still sees 'CC' as set to the cross-compiler

........
r49099 | kpfleming | 2007-01-01 16:48:03 -0600 (Mon, 01 Jan 2007) | 2 lines

use a simpler (and portable) method to ensure that menuselect is built as a host binary

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-01 22:49:56 +00:00
Jason Parker 05d6c4a2d0 Merged revisions 48906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48906 | qwell | 2006-12-22 16:33:46 -0600 (Fri, 22 Dec 2006) | 2 lines

Minor fixes for Solaris.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-22 22:34:31 +00:00
Joshua Colp 83d3b6adda Merged revisions 48571 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48571 | file | 2006-12-18 22:46:12 -0500 (Mon, 18 Dec 2006) | 2 lines

Use env -i to start a fresh environment when going to build menuselect. This is more portable then using unset. (issue #8543 reported by jtodd)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-19 03:47:44 +00:00
Kevin P. Fleming 89c41e2403 Merged revisions 48525 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48525 | kpfleming | 2006-12-16 15:14:34 -0600 (Sat, 16 Dec 2006) | 2 lines

simplify dependency tracking system, using the compiler's built-in method for generating them, and only doing dependency tracking if developer mode is enabled via the configure script

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-16 21:24:52 +00:00
Kevin P. Fleming 018a9c86e4 Merged revisions 48521 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48521 | kpfleming | 2006-12-16 14:12:41 -0600 (Sat, 16 Dec 2006) | 2 lines

since we really, really have to have autoconfig.h included before all other headers (especially system headers), the Makefile will now force it to happen (this will fix build problems with files like ast_expr2f.c, where we can't control the inclusion order in the file itself)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-16 20:19:19 +00:00
Russell Bryant c1a36cb52f Merged revisions 48190 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48190 | russell | 2006-12-01 18:16:28 -0500 (Fri, 01 Dec 2006) | 12 lines

FreeBSD 6.1 does not include wget by default.  However, it has fetch which will
work just fine for our purposes of downloading the sounds packages.  So, check
for both wget and fetch and the configure script and use what was found to
download them.  If neither one was found, and sound packages are selected that
must be downloaded, the install process will print out an informative error
message indicating the situation.

Also, fix a couple places where "make" was hard coded into some output messages
by replacing them with the $(MAKE) variable.

(issue #8451, initial patch by pabelanger, with additional modifications by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-01 23:20:17 +00:00
Jason Parker ac9100bfee Merged revisions 48095 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48095 | qwell | 2006-11-28 12:26:53 -0600 (Tue, 28 Nov 2006) | 2 lines

Export several more variables in top level Makefile.  Inspired by issue 8438.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48096 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 18:28:07 +00:00
Russell Bryant f5176bcebb Merged revisions 47494 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47494 | russell | 2006-11-11 10:31:08 -0500 (Sat, 11 Nov 2006) | 6 lines

Add the target "menuconfig" as an alias for the "menuselect" target.  This is
just a favor to users so that if you accidentally type "make menuconfig"
instead of "make menuselect", it still works.
(inspired by a comment on IRC from wangster calling me an "especially devious
asterisk developer" for having it be menuselect instead of menuconfig. :) )

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47495 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-11 15:33:06 +00:00
Russell Bryant f89ccdc0f3 Merged revisions 46847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46847 | russell | 2006-11-01 17:51:21 -0500 (Wed, 01 Nov 2006) | 3 lines

Fixes for cross-compilation on mips 
(issue #8058, ywalther, with some modifications)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46848 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-01 22:54:15 +00:00
Russell Bryant 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
Joshua Colp 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
Joshua Colp 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
Joshua Colp 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
Luigi Rizzo 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
Kevin P. Fleming 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
Russell Bryant 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
Luigi Rizzo 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Matthew Fredrickson 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
Jason Parker 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Russell Bryant 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
Luigi Rizzo 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
Russell Bryant 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
Jason Parker 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
Russell Bryant 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
Jason Parker 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Joshua Colp 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
Russell Bryant 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
Russell Bryant 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Russell Bryant 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
Russell Bryant 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
Russell Bryant 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