mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-13 16:21:01 +00:00
Move the last instance of AST_LIBS to the only place it is used,
namely main/Makefile . I am unclear where decisions on the build environment (CFLAGS, LDFLAGS, LIBS and so on) should be made - right now they are split here and there. As a first step in cleaning up this situation, i am trying to at least collect all instances of each variable in one place. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
4
Makefile
4
Makefile
@@ -15,7 +15,6 @@
|
||||
#
|
||||
# ASTCFLAGS - compiler options
|
||||
# ASTLDFLAGS - linker flags (not libraries)
|
||||
# AST_LIBS - libraries to build binaries XXX
|
||||
# LIBS - additional libraries, at top-level for all links,
|
||||
# on a single object just for that object
|
||||
# SOLINK - linker flags used only for creating shared objects (.so files),
|
||||
@@ -229,7 +228,6 @@ ifeq ($(OSARCH),FreeBSD)
|
||||
# -V is understood by BSD Make, not by GNU make.
|
||||
BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
|
||||
ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
|
||||
AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
|
||||
endif
|
||||
|
||||
ifeq ($(OSARCH),NetBSD)
|
||||
@@ -348,7 +346,7 @@ main: $(filter-out main,$(MOD_SUBDIRS))
|
||||
|
||||
$(MOD_SUBDIRS):
|
||||
@echo " [enter MOD_SUBDIR $@/]"
|
||||
@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
|
||||
@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
|
||||
@echo " [exit MOD_SUBDIR $@/]"
|
||||
|
||||
$(OTHER_SUBDIRS):
|
||||
|
@@ -85,6 +85,9 @@ else
|
||||
endif
|
||||
|
||||
ifeq ($(OSARCH),FreeBSD)
|
||||
# -V is understood by BSD Make, not by GNU make.
|
||||
BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
|
||||
AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
|
||||
AST_LIBS+=-lcrypto
|
||||
endif
|
||||
|
||||
|
Reference in New Issue
Block a user