From f505cb1c084cbdb8a17f46bd75545ded8bea97a0 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sun, 29 Mar 2009 05:43:28 +0000 Subject: [PATCH] Merged revisions 184838 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r184838 | russell | 2009-03-29 00:32:04 -0500 (Sun, 29 Mar 2009) | 8 lines Simplify chan_h323 build to not require a second run of "make". (closes issue #14715) Reported by: jthurman Patches: h323-makefile-1.6.0.7-rc2.patch uploaded by jthurman (license 614) h323-makefile-1.6.1.0-rc3.patch uploaded by jthurman (license 614) h323-makefile-1.6.2.0-beta1.patch uploaded by jthurman (license 614) Tested by: tzafrir, russell ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@184841 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/Makefile | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/channels/Makefile b/channels/Makefile index 34bd8e092d..6fb75bec53 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -57,25 +57,14 @@ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) LIBS+= -lres_monitor.so -lres_features.so endif -clean:: - $(MAKE) -C misdn clean - ifneq ($(wildcard h323/Makefile.ast),) - include h323/Makefile.ast +include h323/Makefile.ast +endif H323LDFLAGS+=-Wl,--version-script=h323/noexport.map + clean:: + $(MAKE) -C misdn clean if [ -f h323/Makefile ]; then $(MAKE) -C h323 clean; fi -else -h323/libchanh323.a h323/Makefile.ast: - $(CMD_PREFIX) $(MAKE) -C h323 - $(CMD_PREFIX) rm -f ../main/asterisk - $(CMD_PREFIX) echo "***************************************************************" - $(CMD_PREFIX) echo - $(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********" - $(CMD_PREFIX) echo - $(CMD_PREFIX) echo "***************************************************************" - $(CMD_PREFIX) exit 1 -endif dist-clean:: rm -f h323/Makefile @@ -101,3 +90,9 @@ misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o $(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): console_video.o vgrabbers.o console_board.o + +h323/Makefile.ast: + $(CMD_PREFIX) $(MAKE) -C h323 Makefile.ast + +h323/libchanh323.a: + $(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a