Tzafrir Cohen wrote:
--- asterisk-1.4.8~dfsg.orig/main/Makefile
+++ asterisk-1.4.8~dfsg/main/Makefile
@@ -120,13 +120,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
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
-
Why wouldn't ../channels/h323/Makefile.ast be present? Elementary,
Watson: on the first run of make we generate it and then stop 'make'.
:-(
I'm removing the whole thing because I'm removing the only users of
H323LDFLAGS/LIBS.
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 \
@@ -135,7 +128,7 @@ asterisk: $(OBJS) editline/libedit.a db1
@rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK)
$(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS)
$(AST_EMBED_LIBS) $(H323LDLIBS)
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK)
$(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
@$(ASTTOPDIR)/build_tools/strip_nonapi $@
clean::
I haven't tried it. But at first glance it seems as if this will breake
building chan_h323, right?
No. That's building main/asterisk.
chan_h323.so is getting built by channels/h323/Makefile which has the
appropriate compiler/linker arguments.
As for your other mail, I'm not very familiar with the situation wrt the
embedded modules, but it looks like this should go to AST_EMBED_LIBS.
Not that it matters for us, anyway.
Oh and the patch is build-tested and runtime-without-H.323 tested but I
don't expect any problems (ldd chan_h323.so is fine)
Regards,
Faidon
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
