Commit 7919889a authored by Emmanuel Milou's avatar Emmanuel Milou
parents 9bd195ad 15a73f07

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
include build.mak
include build/host-$(HOST_NAME).mak
-include user.mak
include version.mak
DIRS = pjlib/build pjlib-util/build pjnath/build pjmedia/build pjsip/build $(EXTRA_DIRS)
DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build pjsip-apps/build $(EXTRA_DIRS)
ifdef MINSIZE
MAKE_FLAGS := MINSIZE=1
......@@ -23,7 +24,7 @@ doc:
exit 1; \
fi
for dir in $(DIRS); do \
if $(MAKE) $(MAKE_FLAGS) -C $$dir/build $@; then \
if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \
true; \
else \
exit 1; \
......@@ -34,10 +35,13 @@ LIBS = pjlib/lib/libpj-$(TARGET_NAME).a \
pjlib-util/lib/libpjlib-util-$(TARGET_NAME).a \
pjnath/lib/libpjnath-$(TARGET_NAME).a \
pjmedia/lib/libpjmedia-$(TARGET_NAME).a \
pjmedia/lib/libpjmedia-audiodev-$(TARGET_NAME).a \
pjmedia/lib/libpjmedia-codec-$(TARGET_NAME).a \
pjsip/lib/libpjsip-$(TARGET_NAME).a \
pjsip/lib/libpjsip-ua-$(TARGET_NAME).a \
pjsip/lib/libpjsip-simple-$(TARGET_NAME).a \
pjsip/lib/libpjsua-$(TARGET_NAME).a
BINS = pjsip-apps/bin/pjsua-$(TARGET_NAME)$(HOST_EXE)
size:
@echo -n 'Date: '
......@@ -89,7 +93,6 @@ pjsua-test:
cd tests/pjsua && python runall.py
prefix = $(ac_prefix)
include version.mak
install:
mkdir -p $(DESTDIR)$(prefix)/lib
......
......@@ -596,10 +596,14 @@ ac_main_obj
ac_host
ac_linux_poll
ac_cross_compile
opencore_amrnb_present
opencore_amrnb_h_present
ac_no_opencore_amrnb
libcrypto_present
libssl_present
openssl_h_present
ac_no_ssl
ac_resample_dll
ac_no_ilbc_codec
ac_no_speex_codec
ac_no_g7221_codec
......@@ -621,6 +625,7 @@ ac_os_objs
EGREP
GREP
CPP
ac_shlib_suffix
ac_build_mak_vars
ac_pjdir
CC_CFLAGS
......@@ -716,11 +721,13 @@ enable_g7221_codec
enable_speex_codec
enable_ilbc_codec
enable_libsamplerate
enable_resample_dll
enable_ipp
with_ipp
with_ipp_samples
with_ipp_arch
enable_ssl
enable_opencore_amrnb
'
ac_precious_vars='build_alias
host_alias
......@@ -1368,12 +1375,17 @@ Optional Features:
--disable-ilbc-codec Exclude iLBC codec in the build
--enable-libsamplerate Link with libsamplerate when available. Note that
PJMEDIA_RESAMPLE_IMP must also be configured
--enable-resample-dll Build libresample as shared library
--enable-ipp Enable Intel IPP support. Specify the Intel IPP
package and samples location using IPPROOT and
IPPSAMPLES env var or with --with-ipp and
--with-ipp-samples options
--disable-ssl Exclude SSL support the build (default: autodetect)
--disable-opencore-amrnb
Exclude OpenCORE AMR-NB support from the build
(default: autodetect)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
......@@ -2362,12 +2374,18 @@ test -n "$target_alias" &&
test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, &&
program_prefix=${target_alias}-
ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h "
ac_config_headers="$ac_config_headers pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h"
ac_config_files="$ac_config_files build.mak build/os-auto.mak build/cc-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/os-auto.mak third_party/build/portaudio/os-auto.mak"
ac_config_files="$ac_config_files build.mak build/os-auto.mak build/cc-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak"
test "$CFLAGS" = "" && CFLAGS="-O2"
CFLAGS="$CFLAGS -DNDEBUG -g" # no assertions, debug symbols
if test "$CFLAGS" = ""; then
CFLAGS="-O2"
else
CFLAGS="$CFLAGS"
fi
CXXFLAGS="$CFLAGS $CXXFLAGS"
ac_ext=c
......@@ -3433,7 +3451,7 @@ if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
if test "$LD" = ""; then LD="$CC"; fi
if test "$LDOUT" = ""; then LDOUT="-o"; fi
if test "$LDOUT" = ""; then LDOUT="-o "; fi
if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
......@@ -3443,7 +3461,7 @@ if test "$LIBEXT" = ""; then LIBEXT='a'; fi
if test "$LIBEXT2" = ""; then LIBEXT2=""; fi
if test "$CC_OUT" = ""; then CC_OUT="-o"; fi
if test "$CC_OUT" = ""; then CC_OUT="-o "; fi
if test "$CC_INC" = ""; then CC_INC="-I"; fi
......@@ -3474,6 +3492,19 @@ case $host in
esac
case $target in
*mingw* | *cygw* | *win32* | *w32* )
ac_shlib_suffix=dll
;;