diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-04-02 08:36:01 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-04-02 08:36:01 -0500 |
| commit | c66fde8247cd8484da7b62125530bcd81e57eaf0 (patch) | |
| tree | 9e81c53582eda5769b84709482cb85f7b3041203 /main | |
| parent | 0718964e32bc212985b5301375d0b162f61b13fc (diff) | |
| parent | d6fda173a40e078db219e9aaceb7f3ce9ba1b4e4 (diff) | |
Merge "BuildSystem: With external editline, do not require libs for internal editline."
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/main/Makefile b/main/Makefile index fb985b9b8..bef70e966 100644 --- a/main/Makefile +++ b/main/Makefile @@ -57,9 +57,9 @@ ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-musl kfreebs ifneq (x$(CAP_LIB),x) AST_LIBS+=$(CAP_LIB) endif - AST_LIBS+=-lpthread $(EDITLINE_LIB) -lm -lresolv + AST_LIBS+=-lpthread -lm -lresolv else - AST_LIBS+=$(EDITLINE_LIB) -lm + AST_LIBS+=-lm endif ifneq ($(findstring BETTER_BACKTRACES,$(MENUSELECT_CFLAGS)),) @@ -90,11 +90,11 @@ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) ASTLINK+=-shared -Wl,--out-implib,libasterisk.a endif ifeq ($(OSARCH),NetBSD) - AST_LIBS+=-lpthread -lcrypto -lm -L/usr/pkg/lib $(EDITLINE_LIB) + AST_LIBS+=-lpthread -lcrypto -lm -L/usr/pkg/lib endif ifeq ($(OSARCH),OpenBSD) - AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB) + AST_LIBS+=-lcrypto -lpthread -lm endif ifeq ($(OSARCH),SunOS) @@ -354,7 +354,6 @@ endif rm -f .libasteriskpj* rm -f asterisk.exports libasteriskssl.exports libasteriskpj.exports - @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi @$(MAKE) -C stdtime clean rm -f libresample/src/*.o rm -f *.tmp |