[asterisk-commits] jpeeler: branch 1.6.1 r187914 - in /branches/1.6.1: ./ channels/Makefile

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Apr 10 15:28:18 2009
New Revision: 187914

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=187914
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/Makefile
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/Makefile?view=diff&rev=187914&r1=187913&r2=187914
==============================================================================
--- branches/1.6.1/channels/Makefile (original)
+++ branches/1.6.1/channels/Makefile Fri Apr 10 15:28:18 2009
@@ -60,7 +60,6 @@
 ifneq ($(wildcard h323/Makefile.ast),)
 include h323/Makefile.ast
 endif
-H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
 
 clean::
 	$(MAKE) -C misdn clean
@@ -71,14 +70,18 @@
 
 $(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
@@ -98,7 +101,5 @@
 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
-
-