diff -uNr asterisk-1.6.0.7-rc2/channels/Makefile asterisk-1.6.0.7-rc2-new/channels/Makefile --- asterisk-1.6.0.7-rc2/channels/Makefile 2008-03-11 13:51:18.000000000 -0700 +++ asterisk-1.6.0.7-rc2-new/channels/Makefile 2009-03-21 08:51:54.000000000 -0700 @@ -57,25 +57,14 @@ 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 @@ $(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