Commit graph

352 commits

Author SHA1 Message Date
Tilghman Lesher
459b7e25bc Merged revisions 36290 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r36290 | tilghman | 2006-06-29 14:23:18 -0500 (Thu, 29 Jun 2006) | 2 lines

Bug 7388 - compatibility changes for Solaris

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-29 22:01:41 +00:00
Russell Bryant
0f875c3664 ?= just checks to see if a variable is not yet defined. If MENUSELECT_CFLAGS
was not found in the user level makeopts file, the variable is defined, but
empty.

I wish we could just require GNU make 3.81  :)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36229 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-28 21:33:39 +00:00
Russell Bryant
ecab03293c slight change to pulling out the MENUSELECT_CFLAGS from the user and global
level makeopts files - if MENUSELECT_CFLAGS is set to nothing in the user level
makeotps file, then the Makefile should not look in the global file at all.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36228 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-28 21:26:31 +00:00
Russell Bryant
d17026e670 remove an extra comma
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36227 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-28 21:20:15 +00:00
Russell Bryant
c248b690e4 remove the two uses of the $(or ...) function since it is only supported by
GNU make 3.81 which is less than 3 months old (issue #7442, patch by Corydon76)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36226 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-28 21:09:02 +00:00
Russell Bryant
9d61f19cee allow menuselect to be a symlink to a checkout
(second part of issue #7436, Corydon76)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-28 19:55:05 +00:00
Russell Bryant
9aa1432b46 fix the case where menuselect.makeopts is getting generated in the same run of
"make" as the current build and some of the MENUELSELECT_CFLAGS are set in the
user or global level asterisk.makeopts file


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36192 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-28 15:10:57 +00:00
Jeffrey C. Ollie
5e2ccc9821 menuselect writes both menuselect.makeopts and menuselect.makedeps at once, make sure that the Makefile knows about that.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36179 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-27 18:49:04 +00:00
Russell Bryant
4b64399cc6 don't let the Makefile blow up in menuselect.makeopts is present but
menuselect.makedeps is not.  This would probably only be the case in existing
checkouts ...


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36020 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 14:38:55 +00:00
Kevin P. Fleming
67ea3b2d22 simplify special rule for channel.o
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35944 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 06:27:25 +00:00
Kevin P. Fleming
a579371f43 use new (separate) dependencies file from menuselect
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35895 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-25 08:50:14 +00:00
Kevin P. Fleming
e61d3d91f3 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: https://origsvn.digium.com/svn/asterisk/trunk@35832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-24 19:43:31 +00:00
Russell Bryant
2e9099934b fix dist-clean and add menuselect to the clean target, too
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-24 04:42:35 +00:00
Russell Bryant
b38f45a458 add dependency on menuselect's version of linkedlists.h, list menuselect as
a PHONY target


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35790 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-24 04:34:55 +00:00
Russell Bryant
cdbb0e2bf7 merge changes to get menuselect using svn:externals
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-23 14:19:35 +00:00
Kevin P. Fleming
2f238654de remove any generated doxygen docs during distclean
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-23 08:32:19 +00:00
Russell Bryant
93c833e5d0 remove the autom4te.cache dir on a "make distclean" and add distclean to the
.PHONY list


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-23 02:15:35 +00:00
Russell Bryant
cad05d819b actually allow all of the sub directories to be built when running "make", oops
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 16:26:09 +00:00
Russell Bryant
e807ea95ab add a couple more targets to .PHONY
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35506 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 15:45:32 +00:00
Russell Bryant
48ae9f0d4f - 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: https://origsvn.digium.com/svn/asterisk/trunk@35503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 15:38:13 +00:00
Russell Bryant
55e8a60363 - 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: https://origsvn.digium.com/svn/asterisk/trunk@35501 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 15:08:08 +00:00
Russell Bryant
c95e633c8a use separate targets instead of for loops to process sub directories for the
'clean' and 'clean-depend' targets


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35481 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 14:31:52 +00:00
Russell Bryant
5ed2edeac4 get rid of another annoying stray space in the gcc commands
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35480 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 14:16:41 +00:00
Russell Bryant
9db0520ff9 - 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: https://origsvn.digium.com/svn/asterisk/trunk@35479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 14:09:18 +00:00
Russell Bryant
dbfa007d8a clean up a little mess I created by using the 'or' function instead of gross
nested if statements


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 13:22:07 +00:00
Russell Bryant
e217604a44 use a slightly different, but equivalent way of setting the
SUBDIRS_INSTALL variable


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35438 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 12:48:25 +00:00
Russell Bryant
ad721dc2c1 instead of using a for loop to call 'make install' on each subdirectory, use
separate targets


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 12:33:50 +00:00
Russell Bryant
be0d611984 instead of using a for loop to call make on each subdirectory, use a target for
each subdirectory.
 - the shell code in the for loop doesn't have a manually catch errors from
   make on a subdirectory
 - you can now run something like "make apps" or "make channels" from the root
   source directory
 - This should allow for better support for parallel instances of make (the -j
   option) since make can work on each subdirectory target in parallel


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 12:14:29 +00:00
Russell Bryant
ce76568c52 nothing to see here ...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35416 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 11:39:25 +00:00
Russell Bryant
c399a06450 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: https://origsvn.digium.com/svn/asterisk/trunk@35415 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 11:27:03 +00:00
Russell Bryant
f601dd80fa use $(FIND) and $(LN) from configure
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35393 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 10:38:45 +00:00
Russell Bryant
ac8bd0f0c0 use $(BASENAME) set by configure
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35392 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-22 10:36:45 +00:00
Russell Bryant
8686c659a6 $(INSTALL) is determined by configure and set in the makeopts file
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35123 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-20 15:08:44 +00:00
Russell Bryant
c260301476 - use $(CC) instead of gcc when building testexpr2
- modify ast_expr2.fl and ast_expr2.y to not try to register the file version
  in a STANDALONE build
- add config.status as a dependency on testexpr2 to ensure configure is
  executed before building it
- add include/asterisk/buildopts.h as a dependency for testexpr2 as well
- add -Iinclude to the gcc commands for building the testexpr2 objects so that
  it can find the local asterisk headers


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-20 01:06:50 +00:00
Kevin P. Fleming
487adb43e2 various cleanups, remove support for CVS checkouts
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-19 15:17:32 +00:00
Russell Bryant
9843e16df2 there is no reason to build and link stdtime/libtime.a because we already
directly include stdtime/localtime.o in the OBJS for asterisk, which is the
only object file for libtime


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34629 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-18 20:33:53 +00:00
Joshua Colp
eb5af4b1f3 Fix adsi target in main Makefile and check a variable properly (issue #7369 reported by casper)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34496 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-16 16:45:52 +00:00
Kevin P. Fleming
bc49d5bfb3 moh files will now be distributed in native format, not mp3, so...
update sounds/Makefile to download/unpack the proper files
remove all evidence of mpg123 from the main Makefile
change the sample musiconhold.conf file to use native mode instead of mp3


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32917 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-07 22:37:31 +00:00
Kevin P. Fleming
34cf2c13b8 don't force the sounds to download... only when needed
fix a few buglets i caused in menuselect
remove downloaded sounds on 'dist-clean'


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32901 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-07 21:05:05 +00:00
Kevin P. Fleming
0dd82bc6f1 woo-hoo, now it knows how to download the sound packages... doesn't install them yet though
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32886 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-07 20:54:30 +00:00
Kevin P. Fleming
274ce731e2 move autoconfig.h to the include/asterisk directory so it will get installed
install asterisk.h include the system's default include directory


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32860 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-07 19:05:35 +00:00
Kevin P. Fleming
472c1ca282 simplify autoconfig include mechanism (make tholo happy he can use lint again :-)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-07 18:54:56 +00:00
Russell Bryant
06b381a54d add the ability to do the same thing as "make dont-optimize" by enabling the
option in menuselect.  This is very useful for developers if you want to ensure
that all of your builds are done without optimizations.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-06 00:25:23 +00:00
Kevin P. Fleming
b34e3d09ab begin adding support for new sound packages
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-05 19:16:04 +00:00
Russell Bryant
e21181dbd4 - add slav, zoa, and royk to the CREDITS for the generic jitterbuffer
- change references to the "scx" jitterbuffer to be called "fixed" and change
  references to the "stevek" jitterbuffer to be called "adaptive", instead


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-01 14:07:03 +00:00
Russell Bryant
d1dfe22397 fix the problem where defaults.h is missing after a forced make clean in a
different way that actually works


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31225 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-01 00:09:18 +00:00
Russell Bryant
bb7dd96cfe Add support for using a jitterbuffer for RTP on bridged calls. This includes
a new implementation of a fixed size jitterbuffer, as well as support for the
existing adaptive jitterbuffer implementation. (issue #3854, Slav Klenov)

Thank you very much to Slav Klenov of Securax and all of the people involved
in the testing of this feature for all of your hard work!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-31 16:56:50 +00:00
Russell Bryant
1e61ba6699 restore default paths for FreeBSD (reported by alphaque, fixed by jcollie)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30458 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-25 22:05:12 +00:00
Russell Bryant
ebe974e9e4 defaults.h must be listed as a dependency after the cleantest because if it
forces a make clean, it has to be regenerated.  This fixes the problem that
people have been seeing where the build would fail complaining about defaults.h
not being present.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-20 00:36:18 +00:00
Russell Bryant
8029c58409 there is no reason to explicity specify -fomit-frame-pointer when building with
optimization enabled, because it is enabled automatically (issue #7108, casper)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-19 19:10:06 +00:00