kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix module embedding for chan_h323.

Browse Source 
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
This commit is contained in:
Jeff Peeler
2009-04-10 20:26:46 +00:00
parent 956414abcc
commit a8ffff75bb
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
channels/Makefile
View File

@@ -60,7 +60,6 @@ endif
ifneq ($(wildcard h323/Makefile.ast),) ifneq ($(wildcard h323/Makefile.ast),)
include h323/Makefile.ast include h323/Makefile.ast
endif endif
H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
clean:: clean::
$(MAKE) -C misdn 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 $(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) 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] $^ -> $@" $(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 else
chan_h323.so: chan_h323.o h323/libchanh323.a chan_h323.so: chan_h323.o h323/libchanh323.a
$(ECHO_PREFIX) echo " [LD] $^ -> $@" $(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 $(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
endif
chan_misdn.o: ASTCFLAGS+=-Imisdn chan_misdn.o: ASTCFLAGS+=-Imisdn
@@ -99,7 +102,5 @@ chan_usbradio.so: ASTCFLAGS+=-DNDEBUG
h323/Makefile.ast: h323/Makefile.ast:
$(CMD_PREFIX) $(MAKE) -C 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 $(CMD_PREFIX) $(MAKE) -C h323 libchanh323.a