dect
/
asterisk
Archived
13
0
Fork 0
Commit Graph

485 Commits

Author SHA1 Message Date
russell c25a66aadc If the HTML documentation exists, install it in the static-http/docs directory
so that it can be viewed through the Asterisk http server if it is turned on.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@96887 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-07 17:09:23 +00:00
russell ab908a2a8b Now that the version.h file was getting properly regenerated every time the svn
revision changed, every module that used the version was getting rebuilt after
every svn update.  This severly annoyed me pretty quickly, so I have improved
the situation.

Now, instead of generating version.h, main/version.c is generated.  version.c
includes the version information, as well as a couple of API calls for modules
to retrieve the version.  So now, only version.c will get rebuilt, and the main
asterisk binary relinked, which is must faster than rebuilding http.c, manager.c,
asterisk.c, relinking the asterisk binary, chan_sip.c, func_version.c, res_agi ...

The only minor change in behavior here is that the version information reported by
chan_sip, for example, is the version of the Asterisk core, and not necessarily the
Asterisk version that the chan_sip module came from.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@96717 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-05 22:09:06 +00:00
kpfleming 4aa174283d we have to *always* use a completely silent 'make' invocation for generating the module embedding rules
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@96398 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-03 23:14:15 +00:00
kpfleming d16144aac4 there was no reason to add this define for non-Solaris platforms
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@96397 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-03 23:01:53 +00:00
kpfleming 2733c4c4a6 add some simple infrastructure for modules to be used for testing parts of Asterisk
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@96272 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-03 20:04:30 +00:00
russell 3377f3a6cd Merged revisions 94789 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r94789 | russell | 2007-12-26 11:00:03 -0600 (Wed, 26 Dec 2007) | 5 lines

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: http://svn.digium.com/svn/asterisk/trunk@94792 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-26 17:07:55 +00:00
rizzo 468d95b231 Two small changes:
+ document the difference between "A=foo make ..." and "make A=foo ..."
  and suggest using COPTS/LDOPTS if you need to use the second form to
  pass compiler and loader flags;

+ define only in one place the environment used to build stuff in menuselect/



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93558 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-18 08:20:17 +00:00
kpfleming 6eb087c2b3 make using PRINT_DIR a little easier
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93191 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-17 16:48:01 +00:00
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 d1afe77d7d menuselect.makeopts is not a .PHONY target
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93173 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-16 19:06:31 +00:00
rizzo 85bbad5334 use a simpler idiom for 'cmp -s ...'
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93162 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-16 10:34:55 +00:00
tilghman a4425cc28d Solaris compat fixes
Reported by: snuffy
Patch by: snuffy,tilghman
(Closes issue #11315)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93090 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-14 21:09:17 +00:00
rizzo cce381675e Fix the detection of modules installed from this build.
You can now add the path of local module subdirs from the command line with
   make LOCAL_MOD_SUBDIRS= ....




git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92083 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-10 04:18:07 +00:00
rizzo 8cc18059de make the install target a bit less noisy
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92063 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-10 02:06:40 +00:00
rizzo f0c6161001 document usage of several exported variables
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92062 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-10 01:54:40 +00:00
rizzo 992c109dc4 Implement the outcome of a discussion on the -dev list re. the use
of DESTDIR and INSTALL_PATH - many thanks to Tzafrir Cohen and
Simon Perreault for extremely useful feedback:
 
1. comment out the [directories] section the created asterisk.conf ;
   you can set the correct defaults at build time using INSTALL_PATH,
   so the repetition here is redundant and often wrong.
   (The next step now is move asterisk.conf outside the Makefile to
   asterisk.conf.sample, because there is little if anything here
   that needs to be constructed at build/install time).
 
2. use DESTDIR?=$(INSTALL_PATH) so you only need to specify a path
   once if the two coincide. This should have no ill side effects, 
   because if you don't specify DESTDIR, you really need
   INSTALL_PATH="" to set the correct defaults, and if you specify
   DESTDIR the value is not overridden.

The second part required moving the 'export DESTDIR' right after
the assignment to prevent DESTDIR getting set by the export 
(this is documented in the Makefile).o hopefully avoid the mistake)$

With this change you can now do something like this from your source tree:

	make INSTALL_PATH=/some/place install samples

and then

	main/asterisk -vdc

which will pick up the correct config files and libraries from
/some/place - i.e. great for developers!



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92002 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-09 16:47:25 +00:00
qwell 80cb3f85ab Add Makefile alias target 'pdf' which does the same thing as asterisk.pdf.
Issue 11452, reported by blitzrage.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@90929 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-04 18:15:17 +00:00
russell e09e950389 make sure we check to see if the configure script has been executed on a new checkout or after a distclean
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89590 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-26 17:25:08 +00:00
rizzo e87c861cca initial makefile changes to build loadable modules under cygwin
(not complete yet - still need to sort out dependecies on res_*)



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89443 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-20 07:42:38 +00:00
rizzo ba23cef4c0 will i ever get precedences for windows right ?
in the meantime, use a variable to ease enabling/disabling print subdirectories.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89390 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-17 19:27:51 +00:00
rizzo 49ec17e59f reformulate dependencies in a more correct way
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89389 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-17 19:00:07 +00:00
rizzo aaec5b990e wrong variable, wrong order -> broken build.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89381 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-17 14:44:03 +00:00
rizzo c1f095dd97 support cygwin targets
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89376 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-17 11:57:52 +00:00
rizzo ed06295d0c these linker flags apply to both cygwin and mingw32
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89369 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-17 10:12:43 +00:00
rizzo 9894ab1869 linker flags for mingw32
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89358 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-17 04:19:02 +00:00
tilghman 60b38751b2 Merged revisions 89302 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89302 | tilghman | 2007-11-15 12:37:38 -0600 (Thu, 15 Nov 2007) | 2 lines

Start Asterisk in Debian at a more reasonable time (since zaptel is at level 20)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89304 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-15 18:49:31 +00:00
qwell f13c4e97f3 oops, somebody left out the directory here...
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89203 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-13 00:19:50 +00:00
rizzo 4362bb4033 remove enter/exit comments when handling subdirectory.
If we really want them we can remove the --no-print-directory



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89084 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-07 13:12:28 +00:00
rizzo b80a2e18e5 match changes in menuselect's Makefile
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89082 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-07 11:15:42 +00:00
rizzo 4048d8e9e6 don't export variables that can be retrieved from makeopts in child subdirs
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88898 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-06 07:26:25 +00:00
rizzo 6ba6ba6e24 Move AUDIO_LIBS outside the top level Makefile. This too is used only
in one place.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88770 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-05 21:36:11 +00:00
rizzo 9ed4fe37f7 Move the last instance of AST_LIBS to the only place it is used,
namely main/Makefile .

I am unclear where decisions on the build environment (CFLAGS,
LDFLAGS, LIBS and so on) should be made - right now they are
split here and there.

As a first step in cleaning up this situation, i am trying to at
least collect all instances of each variable in one place.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88767 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-05 21:27:04 +00:00
rizzo e9521cd0c9 Cleanup the installation of samples, avoiding repetitions.
I am preserving the behaviour on *.adsi files,
i.e. overwrite anything there without making a backup.
However I am not sure that this is the intended behaviour.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88675 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-05 19:22:56 +00:00
rizzo 32e50d89aa simplify (hopefully) the printing of $(MAKE) in aligned output.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88652 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-05 18:00:24 +00:00
rizzo 7f0f1e85e8 print messages when entering/leaving a directory so we know where we are
(sometimes it is obvious, sometimes it is not).



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88615 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-05 17:44:10 +00:00
tilghman 4229c71296 Merged revisions 87852 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87852 | tilghman | 2007-10-31 13:03:53 -0500 (Wed, 31 Oct 2007) | 2 lines

Create samples for ALL of the available options in asterisk.conf

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@87854 f38db490-d61c-443f-a65b-d21fe96a405b
2007-10-31 18:09:52 +00:00
kpfleming 8bdcddc624 Merged revisions 87460 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87460 | kpfleming | 2007-10-29 17:04:29 -0500 (Mon, 29 Oct 2007) | 2 lines

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: http://svn.digium.com/svn/asterisk/trunk@87462 f38db490-d61c-443f-a65b-d21fe96a405b
2007-10-29 22:05:17 +00:00
qwell b56389eb19 Merged revisions 86405 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(Closes issue #11029)
........
r86405 | qwell | 2007-10-18 16:58:44 -0500 (Thu, 18 Oct 2007) | 4 lines

Add documentation for options in asterisk.conf

Issue 11029, patch by eserra

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@86408 f38db490-d61c-443f-a65b-d21fe96a405b
2007-10-18 22:03:03 +00:00
qwell eb8aa9fea8 Merged revisions 85684 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #10938)
........
r85684 | qwell | 2007-10-15 15:15:51 -0500 (Mon, 15 Oct 2007) | 5 lines

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: http://svn.digium.com/svn/asterisk/trunk@85685 f38db490-d61c-443f-a65b-d21fe96a405b
2007-10-15 20:16:48 +00:00
russell b26d058476 Merged revisions 84474 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84474 | russell | 2007-10-02 15:06:07 -0500 (Tue, 02 Oct 2007) | 5 lines

* 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: http://svn.digium.com/svn/asterisk/trunk@84475 f38db490-d61c-443f-a65b-d21fe96a405b
2007-10-02 20:07:15 +00:00
qwell d8dcdb0740 Merged revisions 84291 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84291 | qwell | 2007-10-01 16:52:45 -0500 (Mon, 01 Oct 2007) | 6 lines

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: http://svn.digium.com/svn/asterisk/trunk@84300 f38db490-d61c-443f-a65b-d21fe96a405b
2007-10-01 21:54:41 +00:00
tilghman 7a8c90073a Permit custom locations for astdb and the keys directory (though default to the current locations) (Closes issue #10267)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@83726 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-24 22:06:19 +00:00
qwell ab1df9e704 Merged revisions 81826 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81826 | qwell | 2007-09-06 17:05:02 -0500 (Thu, 06 Sep 2007) | 1 line

We added COPTS for ASTCFLAGS additions, but not LDOPTS for ASTLDFLAGS.  This adds LDOPTS
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81827 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-06 22:06:17 +00:00
qwell 6203f85f62 Merged revisions 80330 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80330 | qwell | 2007-08-22 13:53:18 -0500 (Wed, 22 Aug 2007) | 7 lines

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: http://svn.digium.com/svn/asterisk/trunk@80331 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-22 18:54:30 +00:00
qwell f7a10e2229 Merged revisions 80304 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80304 | qwell | 2007-08-22 13:25:34 -0500 (Wed, 22 Aug 2007) | 2 lines

Change a syntax that the GNU make in Solaris dislikes.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80305 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-22 18:25:58 +00:00
russell e6b7d0ae08 Merged revisions 80257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80257 | russell | 2007-08-22 11:21:58 -0500 (Wed, 22 Aug 2007) | 4 lines

Honor the contents of the COPTS variable as custom target CFLAGS.  Apparently
this is what openwrt does.  
(reported by Brian Capouch on the asterisk-dev list, patch by me)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80258 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-22 16:22:27 +00:00
murf 75d18809fa Merged revisions 78891 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r78891 | murf | 2007-08-09 17:10:46 -0600 (Thu, 09 Aug 2007) | 1 line

This fixes bug 10416; thanks to mvanbaak for the pretty output
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@78906 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-09 23:32:23 +00:00
tilghman dfcfc3f22a Target asterisk.pdf stopped building when the build was moved to the doc directory.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77602 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-27 23:16:04 +00:00
russell fbb5cadc69 Merged revisions 77410 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r77410 | russell | 2007-07-26 16:23:23 -0500 (Thu, 26 Jul 2007) | 10 lines

AST_DEVMODE was defined in trunk, but not in 1.4.  When Asterisk is compiled
under dev mode, AST_DEVMODE will get defined in buildopts.h.  Change 1.4 to
define it in the same way that trunk does.  Also, revert the change that added
this define in the Makefile

The advantage to doing it this way is that buildopts.h gets installed when
you install Asterisk.  Then, when building any out of tree modules, or
building asterisk-addons, these modules know which options the rest of Asterisk
was built with.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77411 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-26 21:24:42 +00:00
mmichelson b99f12a764 Merged revisions 77380 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r77380 | mmichelson | 2007-07-26 15:35:17 -0500 (Thu, 26 Jul 2007) | 7 lines

Fixes to get ast_backtrace working properly. The AST_DEVMODE macro was never defined so the majority of ast_backtrace never
attempted compilation. The makefile now defines AST_DEVMODE if configure was run with --enable-dev-mode. Also, changes were 
made to acccomodate 64 bit systems in ast_backtrace.

Thanks to qwell, kpfleming, and Corydon76 for their roles in allowing me to get this committed


........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77381 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-26 20:39:46 +00:00