From a8ffff75bb82651e94593901fd1cbef611feef83 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Fri, 10 Apr 2009 20:26:46 +0000 Subject: Fix module embedding for chan_h323. Include libchanh323.a in the modules.link file so that all the symbols can be resolved at link time. (closes issue #11966) Reported by: dome Patches: issue_11966.patch uploaded by kpfleming (license 421) Tested by: jpeeler git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@187906 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'channels/Makefile') diff --git a/channels/Makefile b/channels/Makefile index ecdf96e40..cb7676dcf 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -60,7 +60,6 @@ endif ifneq ($(wildcard h323/Makefile.ast),) include h323/Makefile.ast endif -H323LDFLAGS+=-Wl,--version-script=h323/noexport.map clean:: $(MAKE) -C misdn clean @@ -71,15 +70,19 @@ dist-clean:: $(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): iax2-parser.o iax2-provision.o +ifneq ($(filter chan_h323,$(EMBEDDED_MODS)),) +modules.link: h323/libchanh323.a +else ifeq ($(OSARCH),linux-gnu) -chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast +chan_h323.so: chan_h323.o h323/libchanh323.a $(ECHO_PREFIX) echo " [LD] $^ -> $@" - $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) + $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(H323LDLIBS) else chan_h323.so: chan_h323.o h323/libchanh323.a $(ECHO_PREFIX) echo " [LD] $^ -> $@" $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat endif +endif chan_misdn.o: ASTCFLAGS+=-Imisdn @@ -99,7 +102,5 @@ chan_usbradio.so: ASTCFLAGS+=-DNDEBUG h323/Makefile.ast: $(CMD_PREFIX) $(MAKE) -C h323 Makefile.ast -h323/libchanh323.a: +h323/libchanh323.a: h323/Makefile.ast $(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a - - -- cgit v1.2.3