diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-10 20:28:36 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-10 20:28:36 +0000 |
| commit | 76d98301872cbd51d96f51f1473e61a55c7cf09f (patch) | |
| tree | 0f0d101a30c0fcd3a15a7ea8813d77e14e21d242 /channels/Makefile | |
| parent | f585c111e89a9cb43c7079a0189ec63d3ef3cfd8 (diff) | |
Merged revisions 187906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r187906 | jpeeler | 2009-04-10 15:26:46 -0500 (Fri, 10 Apr 2009) | 12 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@187916 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/Makefile')
| -rw-r--r-- | channels/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
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 - - |