aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-30 16:37:21 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-30 16:37:21 +0000
commit5b3b15328fc32e1708c2ac731c59e9b59ec13b3a (patch)
treed587d6fcffa7d423427ff8c5f81aaef95a9d3687 /Makefile
parent3b3c483ceff9cab8a9cb49c6077d400649bb0800 (diff)
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: http://svn.digium.com/svn/asterisk/trunk@44081 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b38133a72..e72fbf437 100644
--- a/Makefile
+++ b/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