diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2006-09-30 16:37:21 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2006-09-30 16:37:21 +0000 |
| commit | 8d6d166b14b5c3cb569670a8501cfb808ab19b57 (patch) | |
| tree | d587d6fcffa7d423427ff8c5f81aaef95a9d3687 /main/Makefile | |
| parent | d2087e6a097a53b1c815194a09ebf4d2ce51bc27 (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: https://origsvn.digium.com/svn/asterisk/trunk@44081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index 44329165e..c2e8ef6e0 100644 --- a/main/Makefile +++ b/main/Makefile @@ -93,7 +93,7 @@ ifeq ($(OSARCH),SunOS) endif editline/libedit.a: - cd editline && test -f config.h || CFLAGS="$(ASTCFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) + cd editline && test -f config.h || CFLAGS="$(ASTCFLAGS:-Werror=)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) $(MAKE) -C editline libedit.a db1-ast/libdb1.a: |