diff options
| author | Matthew Jordan <mjordan@digium.com> | 2014-07-04 15:11:51 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2014-07-04 15:11:51 +0000 |
| commit | 0e844b7598d2d5e95c575a449bf36c80bc876ac3 (patch) | |
| tree | d4647fd7c235df9c4015e1f0c1547b8a55990440 /main/Makefile | |
| parent | 46b00b9c646ccc0ee94c7f994795bae893cfa0dd (diff) | |
configure: Remove last vestiges of h323; DO create menuselect-deps
The previous patch (r418034) fixed the 'glitch' that the channels/h323
Makefile no longer existed. Unfortunately, removing the entire line was a bit
of a blunder, as it meant that build_tools/menuselect-deps was never
generated. Hilarity ensued when actually trying to compile.
But hey! At least configure worked.
This patch fixes *that* glitch, and removes some more of the vestiges of h323.
(It had tendrils in the main Makefile? Crazy.)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418035 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/main/Makefile b/main/Makefile index ba4c05a3b..932f3155b 100644 --- a/main/Makefile +++ b/main/Makefile @@ -171,13 +171,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep))) 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 - ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) MAIN_TGT:=asterisk.dll asterisk: cygload @@ -254,11 +247,6 @@ tcptls.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE) $(MAIN_TGT): $(OBJS) $(ASTSSL_LIB) $(LIBEDIT_OBJ) $(AST_EMBED_LDSCRIPTS) @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) $(ECHO_PREFIX) echo " [LD] $(OBJS) $(LIBEDIT_OBJ) $(AST_EMBED_LDSCRIPTS) -> $@" -ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) - $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) $(ASTSSL_LDLIBS) $(LIBEDIT_OBJ) $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) -else - $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) $(ASTSSL_LDLIBS) $(LIBEDIT_OBJ) $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) -endif ifeq ($(GNU_LD),1) $(MAIN_TGT): asterisk.exports |