Commit Graph

374 Commits

Author SHA1 Message Date
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
Russell Bryant 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Russell Bryant 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
Kevin P. Fleming 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
Kevin P. Fleming 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
Russell Bryant 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
Russell Bryant 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
Russell Bryant 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
Russell Bryant 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
Russell Bryant 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 63e4f53ee5 change bracket style because i'm picky
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36462 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-01 03:21:56 +00:00
Russell Bryant 03f2685c76 menuselect doesn't pull strcompat.o from asterisk anymore
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-01 03:21:06 +00:00
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