diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
commit | 8b0c007ad990aa27d9868da49215fd1076ac77cc (patch) | |
tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /makeopts.in | |
parent | a42edc84034f91932a3e12d503e07f76a6eb498a (diff) |
merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems
- support for embedded modules
- support for static builds
- simpler cross-compilation support
- simpler module/loader interface (no exported symbols)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'makeopts.in')
-rw-r--r-- | makeopts.in | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/makeopts.in b/makeopts.in index fce6cdca7..eb80fc970 100644 --- a/makeopts.in +++ b/makeopts.in @@ -3,7 +3,7 @@ # dependencies in menuselect for the same package. CC=@CC@ -HOST_CC=@CC@ +HOST_CC=cc CXX=@CXX@ INSTALL=@INSTALL@ @@ -18,10 +18,18 @@ LN=@LN@ QTMOC=@QTMOC@ DOT=@DOT@ -CROSS_ARCH=@PBX_OSTYPE@ -CROSS_PROC=@PBX_CPU@ -PROC=@PBX_CPU@ -OSARCH=@PBX_OSTYPE@ +BUILD_PLATFORM=@BUILD_PLATFORM@ +BUILD_CPU=@BUILD_CPU@ +BUILD_VENDOR=@BUILD_VENDOR@ +BUILD_OS=@BUILD_OS@ + +HOST_PLATFORM=@HOST_PLATFORM@ +HOST_CPU=@HOST_CPU@ +HOST_VENDOR=@HOST_VENDOR@ +HOST_OS=@HOST_OS@ + +PROC=@HOST_CPU@ +OSARCH=@HOST_OS@ OSREV=@PBX_OSREV@ prefix = @prefix@ @@ -55,6 +63,7 @@ EDITLINE_LIB=@EDITLINE_LIB@ FREETDS_INCLUDE=@FREETDS_INCLUDE@ FREETDS_LIB=@FREETDS_LIB@ +GSM_INTERNAL=@GSM_INTERNAL@ GSM_INCLUDE=@GSM_INCLUDE@ GSM_LIB=@GSM_LIB@ @@ -134,3 +143,12 @@ ZAPTEL_INCLUDE=@ZAPTEL_INCLUDE@ ZLIB_INCLUDE=@ZLIB_INCLUDE@ ZLIB_LIB=@ZLIB_LIB@ + +ISDNNET_INCLUDE=@ISDNNET_INCLUDE@ +ISDNNET_LIB=@ISDNNET_LIB@ + +MISDN_INCLUDE=@MISDN_INCLUDE@ +MISDN_LIB=@MISDN_LIB@ + +SUPPSERV_INCLUDE=@SUPPSERV_INCLUDE@ +SUPPSERV_LIB=@SUPPSERV_LIB@ |