diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-29 15:59:10 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-29 15:59:10 +0000 |
| commit | b959f9e59d3001917105d04f0d8e84ffb76f1532 (patch) | |
| tree | 54aa1c432d7799c3cb80a58697c9f34387e788d6 /main/Makefile | |
| parent | 211ee53efc3a90cdcf2353e09f9462cfe1ae13a0 (diff) | |
Merged revisions 81342 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81342 | russell | 2007-08-29 10:57:29 -0500 (Wed, 29 Aug 2007) | 3 lines
If chan_h323 is not being built, don't use g++ to do the final link of Asterisk.
(in response to a question on the asterisk-dev list)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81343 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/Makefile b/main/Makefile index fb807488b..ace2c813b 100644 --- a/main/Makefile +++ b/main/Makefile @@ -142,7 +142,11 @@ minimime/libmmime.a: CHECK_SUBDIR asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS) @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c $(ECHO_PREFIX) echo " [LD] $^ -> $@" +ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) +else $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) +endif @$(ASTTOPDIR)/build_tools/strip_nonapi $@ clean:: |