mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-25 06:00:36 +00:00
merge compile fixes from 44080:
- with AST_DEVMODE, building codecs/lpc10 fails because of lots of warnings, and the configure step in editline fails as well. Fix this by removing the -Werror in these steps. - on FreeBSD (but probably on other platforms as well), the final link of asterisk fails because AST_LIBS was not exported to the subdirs Makefiles. Add a proper fix in the top-level Makefile (a possible alternative way is to add "export AST_LIBS" near the beginning of the file). With this fix, i believe that some of the platform-specific conditionals in main/Makefile are redundant (because they should be already dealt with in the top level Makefile) but i don't have a platform to check. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
3
Makefile
3
Makefile
@@ -15,6 +15,7 @@
|
||||
#
|
||||
# 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),
|
||||
@@ -302,7 +303,7 @@ $(SUBDIRS): depend makeopts.embed_rules
|
||||
main: $(filter-out main,$(MOD_SUBDIRS))
|
||||
|
||||
$(MOD_SUBDIRS):
|
||||
@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
|
||||
@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
|
||||
|
||||
$(OTHER_SUBDIRS):
|
||||
@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
|
||||
|
||||
Reference in New Issue
Block a user