[asterisk-commits] pcadach: branch pcadach/chan_h323-live r42013 - /team/pcadach/chan_h323-live/...

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Tue Sep  5 09:04:09 2006
New Revision: 42013

URL: http://svn.digium.com/view/asterisk?rev=42013&view=rev
Log:
Pre-link openh323/pwlib libraries into main binary to resolve initialization/destruction conflicts. Sorry guys...

Modified:
    team/pcadach/chan_h323-live/main/Makefile

Modified: team/pcadach/chan_h323-live/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/main/Makefile?rev=42013&r1=42012&r2=42013&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/main/Makefile (original)
+++ team/pcadach/chan_h323-live/main/Makefile Tue Sep  5 09:04:09 2006
@@ -119,6 +119,13 @@
 AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
 OBJS:=$(sort $(OBJS))
 
+ifneq ($(wildcard ../channels/h323/Makefile.ast),)
+  include ../channels/h323/Makefile.ast
+else
+  H323LDFLAGS=
+  H323LDLIBS=
+endif
+
 asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 	@$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp
 	@if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \
@@ -127,7 +134,7 @@
 	@rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
 	@$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o asterisk $(ASTLINK) $(AST_EMBED_LDFLAGS) $(LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o asterisk $(ASTLINK) $(AST_EMBED_LDFLAGS) $(LDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
 
 clean::
 	rm -f asterisk