![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
Changeset 4656
- Timestamp:
- Nov 23, 2013 7:13:40 AM (11 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 29 edited
-
Makefile (modified) (1 diff)
-
aconfigure (modified) (39 diffs)
-
aconfigure.ac (modified) (2 diffs)
-
build.mak.in (modified) (7 diffs)
-
build/rules.mak (modified) (4 diffs)
-
libpjproject.pc.in (modified) (1 diff)
-
pjlib-util/build/Makefile (modified) (7 diffs)
-
pjlib/build/Makefile (modified) (7 diffs)
-
pjlib/build/os-auto.mak.in (modified) (1 diff)
-
pjlib/build/os-darwinos.mak (modified) (1 diff)
-
pjlib/build/os-linux-kernel.mak (modified) (1 diff)
-
pjlib/build/os-linux.mak (modified) (1 diff)
-
pjlib/build/os-rtems.mak (modified) (1 diff)
-
pjlib/build/os-sunos.mak (modified) (1 diff)
-
pjlib/build/os-win32.mak (modified) (1 diff)
-
pjmedia/build/Makefile (modified) (12 diffs)
-
pjmedia/include/pjmedia-videodev/config.h (modified) (2 diffs)
-
pjnath/build/Makefile (modified) (9 diffs)
-
pjsip-apps/build/Makefile (modified) (8 diffs)
-
pjsip-apps/build/Samples.mak (modified) (3 diffs)
-
pjsip/build/Makefile (modified) (10 diffs)
-
third_party/build/g7221/Makefile (modified) (3 diffs)
-
third_party/build/gsm/Makefile (modified) (3 diffs)
-
third_party/build/ilbc/Makefile (modified) (3 diffs)
-
third_party/build/milenage/Makefile (modified) (3 diffs)
-
third_party/build/portaudio/Makefile (modified) (3 diffs)
-
third_party/build/resample/Makefile (modified) (3 diffs)
-
third_party/build/speex/Makefile (modified) (3 diffs)
-
third_party/build/srtp/Makefile (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/Makefile
r4627 r4656 106 106 cd tests/pjsua && python runall.py 107 107 108 prefix = $(ac_prefix)109 110 108 install: 111 mkdir -p $(DESTDIR)$( prefix)/lib112 cp - f $(APP_LIB_FILES) $(DESTDIR)$(prefix)/lib/113 mkdir -p $(DESTDIR)$( prefix)/include109 mkdir -p $(DESTDIR)$(libdir)/ 110 cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/ 111 mkdir -p $(DESTDIR)$(includedir)/ 114 112 for d in pjlib pjlib-util pjnath pjmedia pjsip; do \ 115 cp -RLf $$d/include/* $(DESTDIR)$( prefix)/include/; \113 cp -RLf $$d/include/* $(DESTDIR)$(includedir)/; \ 116 114 done 117 mkdir -p $(DESTDIR)$(prefix)/lib/pkgconfig 118 sed -e "s!@PREFIX@!$(DESTDIR)$(prefix)!" libpjproject.pc.in | \ 115 mkdir -p $(DESTDIR)$(libdir)/pkgconfig 116 sed -e "s!@PREFIX@!$(prefix)!" libpjproject.pc.in | \ 117 sed -e "s!@INCLUDEDIR@!$(includedir)!" | \ 118 sed -e "s!@LIBDIR@!$(libdir)!" | \ 119 119 sed -e "s/@PJ_VERSION@/$(PJ_VERSION)/" | \ 120 120 sed -e "s!@PJ_LDLIBS@!$(PJ_LDLIBS)!" | \ 121 sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$( prefix)/lib/pkgconfig/libpjproject.pc121 sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc 122 122 123 123 uninstall: -
pjproject/trunk/aconfigure
r4636 r4656 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.6 9for pjproject 2.x.3 # Generated by GNU Autoconf 2.68 for pjproject 2.x. 4 4 # 5 5 # 6 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. 6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 7 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 8 # Foundation, Inc. 7 9 # 8 10 # … … 133 135 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 134 136 135 # Use a proper internal environment variable to ensure we don't fall136 # into an infinite loop, continuously re-executing ourselves.137 if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then138 _as_can_reexec=no; export _as_can_reexec;139 # We cannot yet assume a decent shell, so we have to provide a140 # neutralization value for shells without unset; and this also141 # works around shells that cannot unset nonexistent variables.142 # Preserve -v and -x to the replacement shell.143 BASH_ENV=/dev/null144 ENV=/dev/null145 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV146 case $- in # ((((147 *v*x* | *x*v* ) as_opts=-vx ;;148 *v* ) as_opts=-v ;;149 *x* ) as_opts=-x ;;150 * ) as_opts= ;;151 esac152 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}153 # Admittedly, this is quite paranoid, since all the known shells bail154 # out after a failed `exec'.155 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2156 as_fn_exit 255157 fi158 # We don't want this to propagate to other subprocesses.159 { _as_can_reexec=; unset _as_can_reexec;}160 137 if test "x$CONFIG_SHELL" = x; then 161 138 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : … … 191 168 exitcode=1; echo positional parameters were not saved. 192 169 fi 193 test x\$exitcode = x0 || exit 1 194 test -x / || exit 1" 170 test x\$exitcode = x0 || exit 1" 195 171 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO 196 172 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO … … 237 213 238 214 if test "x$CONFIG_SHELL" != x; then : 239 export CONFIG_SHELL 240 # We cannot yet assume a decent shell, so we have to provide a 241 # neutralization value for shells without unset; and this also 242 # works around shells that cannot unset nonexistent variables. 243 # Preserve -v and -x to the replacement shell. 244 BASH_ENV=/dev/null 245 ENV=/dev/null 246 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 247 case $- in # (((( 248 *v*x* | *x*v* ) as_opts=-vx ;; 249 *v* ) as_opts=-v ;; 250 *x* ) as_opts=-x ;; 251 * ) as_opts= ;; 252 esac 253 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 254 # Admittedly, this is quite paranoid, since all the known shells bail 255 # out after a failed `exec'. 256 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 257 exit 255 215 # We cannot yet assume a decent shell, so we have to provide a 216 # neutralization value for shells without unset; and this also 217 # works around shells that cannot unset nonexistent variables. 218 # Preserve -v and -x to the replacement shell. 219 BASH_ENV=/dev/null 220 ENV=/dev/null 221 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 222 export CONFIG_SHELL 223 case $- in # (((( 224 *v*x* | *x*v* ) as_opts=-vx ;; 225 *v* ) as_opts=-v ;; 226 *x* ) as_opts=-x ;; 227 * ) as_opts= ;; 228 esac 229 exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 258 230 fi 259 231 … … 357 329 358 330 } # as_fn_mkdir_p 359 360 # as_fn_executable_p FILE361 # -----------------------362 # Test if FILE is an executable regular file.363 as_fn_executable_p ()364 {365 test -f "$1" && test -x "$1"366 } # as_fn_executable_p367 331 # as_fn_append VAR VALUE 368 332 # ---------------------- … … 486 450 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } 487 451 488 # If we had to re-execute with $CONFIG_SHELL, we're ensured to have489 # already done that, so ensure we don't try to do so again and fall490 # in an infinite loop. This has already happened in practice.491 _as_can_reexec=no; export _as_can_reexec492 452 # Don't try to exec as it changes $[0], causing all sort of problems 493 453 # (the dirname of $[0] is not the place where we might find the … … 524 484 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 525 485 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 526 # In both cases, we have to default to `cp -p R'.486 # In both cases, we have to default to `cp -p'. 527 487 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 528 as_ln_s='cp -p R'488 as_ln_s='cp -p' 529 489 elif ln conf$$.file conf$$ 2>/dev/null; then 530 490 as_ln_s=ln 531 491 else 532 as_ln_s='cp -p R'492 as_ln_s='cp -p' 533 493 fi 534 494 else 535 as_ln_s='cp -p R'495 as_ln_s='cp -p' 536 496 fi 537 497 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file … … 545 505 fi 546 506 547 as_test_x='test -x' 548 as_executable_p=as_fn_executable_p 507 if test -x / >/dev/null 2>&1; then 508 as_test_x='test -x' 509 else 510 if ls -dL / >/dev/null 2>&1; then 511 as_ls_L_option=L 512 else 513 as_ls_L_option= 514 fi 515 as_test_x=' 516 eval sh -c '\'' 517 if test -d "$1"; then 518 test -d "$1/."; 519 else 520 case $1 in #( 521 -*)set "./$1";; 522 esac; 523 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 524 ???[sx]*):;;*)false;;esac;fi 525 '\'' sh 526 ' 527 fi 528 as_executable_p=$as_test_x 549 529 550 530 # Sed expression to map a string onto a valid CPP name. … … 673 653 ac_external_gsm 674 654 ac_external_speex 655 ac_shared_libraries 675 656 ac_os_objs 676 657 EGREP … … 759 740 enable_floating_point 760 741 enable_epoll 742 enable_shared 761 743 with_external_speex 762 744 with_external_gsm … … 1263 1245 if test "x$build_alias" = x; then 1264 1246 cross_compiling=maybe 1247 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 1248 If a cross compiler is detected then cross compile mode will be used" >&2 1265 1249 elif test "x$build_alias" != "x$host_alias"; then 1266 1250 cross_compiling=yes … … 1425 1409 Disable floating point where possible 1426 1410 --enable-epoll Use /dev/epoll ioqueue on Linux (experimental) 1411 --enable-shared Build shared libraries 1427 1412 --disable-sound Exclude sound (i.e. use null sound) 1428 1413 --disable-oss Disable OSS audio (default: not disabled) … … 1570 1555 cat <<\_ACEOF 1571 1556 pjproject configure 2.x 1572 generated by GNU Autoconf 2.6 91573 1574 Copyright (C) 201 2Free Software Foundation, Inc.1557 generated by GNU Autoconf 2.68 1558 1559 Copyright (C) 2010 Free Software Foundation, Inc. 1575 1560 This configure script is free software; the Free Software Foundation 1576 1561 gives unlimited permission to copy, distribute and modify it. … … 1686 1671 } && test -s conftest$ac_exeext && { 1687 1672 test "$cross_compiling" = yes || 1688 test -x conftest$ac_exeext1673 $as_test_x conftest$ac_exeext 1689 1674 }; then : 1690 1675 ac_retval=0 … … 1973 1958 1974 1959 It was created by pjproject $as_me 2.x, which was 1975 generated by GNU Autoconf 2.6 9. Invocation command line was1960 generated by GNU Autoconf 2.68. Invocation command line was 1976 1961 1977 1962 $ $0 $@ … … 2498 2483 test -z "$as_dir" && as_dir=. 2499 2484 for ac_exec_ext in '' $ac_executable_extensions; do 2500 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2485 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2501 2486 ac_cv_prog_CC="${ac_tool_prefix}gcc" 2502 2487 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 2538 2523 test -z "$as_dir" && as_dir=. 2539 2524 for ac_exec_ext in '' $ac_executable_extensions; do 2540 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2525 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2541 2526 ac_cv_prog_ac_ct_CC="gcc" 2542 2527 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 2591 2576 test -z "$as_dir" && as_dir=. 2592 2577 for ac_exec_ext in '' $ac_executable_extensions; do 2593 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2578 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2594 2579 ac_cv_prog_CC="${ac_tool_prefix}cc" 2595 2580 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 2632 2617 test -z "$as_dir" && as_dir=. 2633 2618 for ac_exec_ext in '' $ac_executable_extensions; do 2634 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2619 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2635 2620 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then 2636 2621 ac_prog_rejected=yes … … 2690 2675 test -z "$as_dir" && as_dir=. 2691 2676 for ac_exec_ext in '' $ac_executable_extensions; do 2692 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2677 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2693 2678 ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 2694 2679 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 2734 2719 test -z "$as_dir" && as_dir=. 2735 2720 for ac_exec_ext in '' $ac_executable_extensions; do 2736 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then2721 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 2737 2722 ac_cv_prog_ac_ct_CC="$ac_prog" 2738 2723 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 3180 3165 #include <stdarg.h> 3181 3166 #include <stdio.h> 3182 struct stat; 3167 #include <sys/types.h> 3168 #include <sys/stat.h> 3183 3169 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ 3184 3170 struct buf { int x; }; … … 3293 3279 test -z "$as_dir" && as_dir=. 3294 3280 for ac_exec_ext in '' $ac_executable_extensions; do 3295 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then3281 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3296 3282 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" 3297 3283 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 3337 3323 test -z "$as_dir" && as_dir=. 3338 3324 for ac_exec_ext in '' $ac_executable_extensions; do 3339 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then3325 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3340 3326 ac_cv_prog_ac_ct_CXX="$ac_prog" 3341 3327 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 3546 3532 test -z "$as_dir" && as_dir=. 3547 3533 for ac_exec_ext in '' $ac_executable_extensions; do 3548 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then3534 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3549 3535 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 3550 3536 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 3586 3572 test -z "$as_dir" && as_dir=. 3587 3573 for ac_exec_ext in '' $ac_executable_extensions; do 3588 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then3574 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3589 3575 ac_cv_prog_ac_ct_RANLIB="ranlib" 3590 3576 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 3640 3626 test -z "$as_dir" && as_dir=. 3641 3627 for ac_exec_ext in '' $ac_executable_extensions; do 3642 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then3628 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3643 3629 ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 3644 3630 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 3684 3670 test -z "$as_dir" && as_dir=. 3685 3671 for ac_exec_ext in '' $ac_executable_extensions; do 3686 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then3672 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 3687 3673 ac_cv_prog_ac_ct_AR="$ac_prog" 3688 3674 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 4455 4441 for ac_exec_ext in '' $ac_executable_extensions; do 4456 4442 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" 4457 as_fn_executable_p "$ac_path_GREP"|| continue4443 { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue 4458 4444 # Check for GNU ac_path_GREP and select it if it is found. 4459 4445 # Check for GNU $ac_path_GREP … … 4521 4507 for ac_exec_ext in '' $ac_executable_extensions; do 4522 4508 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" 4523 as_fn_executable_p "$ac_path_EGREP"|| continue4509 { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue 4524 4510 # Check for GNU ac_path_EGREP and select it if it is found. 4525 4511 # Check for GNU $ac_path_EGREP … … 5642 5628 { $as_echo "$as_me:${as_lineno-$LINENO}: result: select()" >&5 5643 5629 $as_echo "select()" >&6; } 5630 5631 fi 5632 5633 5634 5635 # Check whether --enable-shared was given. 5636 if test "${enable_shared+set}" = set; then : 5637 enableval=$enable_shared; if test "$enable_shared" = "yes"; then 5638 ac_shared_libraries=1 5639 CFLAGS="$CFLAGS -fPIC" 5640 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building shared libraries... yes" >&5 5641 $as_echo "Building shared libraries... yes" >&6; } 5642 fi 5643 else 5644 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building shared libraries... no" >&5 5645 $as_echo "Building shared libraries... no" >&6; } 5644 5646 5645 5647 fi … … 6325 6327 test -z "$as_dir" && as_dir=. 6326 6328 for ac_exec_ext in '' $ac_executable_extensions; do 6327 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then6329 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6328 6330 ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" 6329 6331 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 6371 6373 test -z "$as_dir" && as_dir=. 6372 6374 for ac_exec_ext in '' $ac_executable_extensions; do 6373 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then6375 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6374 6376 ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" 6375 6377 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 6476 6478 test -z "$as_dir" && as_dir=. 6477 6479 for ac_exec_ext in '' $ac_executable_extensions; do 6478 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then6480 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 6479 6481 ac_cv_prog_PKG_CONFIG="$ac_prog" 6480 6482 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 … … 8158 8160 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 8159 8161 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 8160 # In both cases, we have to default to `cp -p R'.8162 # In both cases, we have to default to `cp -p'. 8161 8163 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 8162 as_ln_s='cp -p R'8164 as_ln_s='cp -p' 8163 8165 elif ln conf$$.file conf$$ 2>/dev/null; then 8164 8166 as_ln_s=ln 8165 8167 else 8166 as_ln_s='cp -p R'8168 as_ln_s='cp -p' 8167 8169 fi 8168 8170 else 8169 as_ln_s='cp -p R'8171 as_ln_s='cp -p' 8170 8172 fi 8171 8173 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file … … 8227 8229 fi 8228 8230 8229 8230 # as_fn_executable_p FILE 8231 # ----------------------- 8232 # Test if FILE is an executable regular file. 8233 as_fn_executable_p () 8234 { 8235 test -f "$1" && test -x "$1" 8236 } # as_fn_executable_p 8237 as_test_x='test -x' 8238 as_executable_p=as_fn_executable_p 8231 if test -x / >/dev/null 2>&1; then 8232 as_test_x='test -x' 8233 else 8234 if ls -dL / >/dev/null 2>&1; then 8235 as_ls_L_option=L 8236 else 8237 as_ls_L_option= 8238 fi 8239 as_test_x=' 8240 eval sh -c '\'' 8241 if test -d "$1"; then 8242 test -d "$1/."; 8243 else 8244 case $1 in #( 8245 -*)set "./$1";; 8246 esac; 8247 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 8248 ???[sx]*):;;*)false;;esac;fi 8249 '\'' sh 8250 ' 8251 fi 8252 as_executable_p=$as_test_x 8239 8253 8240 8254 # Sed expression to map a string onto a valid CPP name. … … 8258 8272 ac_log=" 8259 8273 This file was extended by pjproject $as_me 2.x, which was 8260 generated by GNU Autoconf 2.6 9. Invocation command line was8274 generated by GNU Autoconf 2.68. Invocation command line was 8261 8275 8262 8276 CONFIG_FILES = $CONFIG_FILES … … 8320 8334 ac_cs_version="\\ 8321 8335 pjproject config.status 2.x 8322 configured by $0, generated by GNU Autoconf 2.6 9,8336 configured by $0, generated by GNU Autoconf 2.68, 8323 8337 with options \\"\$ac_cs_config\\" 8324 8338 8325 Copyright (C) 201 2Free Software Foundation, Inc.8339 Copyright (C) 2010 Free Software Foundation, Inc. 8326 8340 This config.status script is free software; the Free Software Foundation 8327 8341 gives unlimited permission to copy, distribute and modify it." … … 8411 8425 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 8412 8426 if \$ac_cs_recheck; then 8413 set X $SHELL'$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion8427 set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 8414 8428 shift 8415 8429 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -
pjproject/trunk/aconfigure.ac
r4636 r4656 424 424 ]) 425 425 426 AC_SUBST(ac_shared_libraries) 427 AC_ARG_ENABLE(shared, 428 AC_HELP_STRING([--enable-shared], 429 [Build shared libraries]), 430 [if test "$enable_shared" = "yes"; then 431 [ac_shared_libraries=1] 432 CFLAGS="$CFLAGS -fPIC" 433 AC_MSG_RESULT([Building shared libraries... yes]) 434 fi], 435 AC_MSG_RESULT([Building shared libraries... no]) 436 ) 437 426 438 427 439 dnl ###################### … … 825 837 ) 826 838 827 dnl # Include libsamplerate828 839 AC_SUBST(ac_resample_dll) 829 840 AC_ARG_ENABLE(resample_dll, -
pjproject/trunk/build.mak.in
r4607 r4656 13 13 export SHLIB_SUFFIX := @ac_shlib_suffix@ 14 14 15 export ac_prefix := @prefix@ 15 export prefix := @prefix@ 16 export exec_prefix := @exec_prefix@ 17 export includedir := @includedir@ 18 export libdir := @libdir@ 16 19 17 20 LIB_SUFFIX = $(TARGET_NAME).a 18 21 22 ifeq (@ac_shared_libraries@,1) 23 export PJ_SHARED_LIBRARIES := 1 24 endif 25 19 26 # Determine which party libraries to use 20 export APP_THIRD_PARTY_LIBS := -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME)21 27 export APP_THIRD_PARTY_EXT := 28 export APP_THIRD_PARTY_LIBS := 22 29 export APP_THIRD_PARTY_LIB_FILES := $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX) 23 30 ifeq ($(PJ_SHARED_LIBRARIES),) 31 APP_THIRD_PARTY_LIBS += -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME) 32 else 33 APP_THIRD_PARTY_LIBS += -lmilenage -lsrtp 34 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libmilenage.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libmilenage.$(SHLIB_SUFFIX) \ 35 $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX) 36 endif 37 38 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) 39 ifeq ($(PJ_SHARED_LIBRARIES),) 24 40 ifeq (@ac_resample_dll@,1) 25 41 export PJ_RESAMPLE_DLL := 1 26 export APP_THIRD_PARTY_LIBS := -lresample $(APP_THIRD_PARTY_LIBS) 27 export APP_THIRD_PARTY_LIB_FILES := $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX) $(APP_THIRD_PARTY_LIB_FILES) 28 else 29 export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) $(APP_THIRD_PARTY_LIBS) 30 export APP_THIRD_PARTY_LIB_FILES := $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(APP_THIRD_PARTY_LIB_FILES) 42 APP_THIRD_PARTY_LIBS += -lresample 43 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX) 44 else 45 APP_THIRD_PARTY_LIBS += -lresample-$(TARGET_NAME) 46 endif 47 else 48 APP_THIRD_PARTY_LIBS += -lresample 49 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX) 31 50 endif 32 51 … … 36 55 APP_THIRD_PARTY_EXT += -lgsm 37 56 else 57 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX) 58 ifeq ($(PJ_SHARED_LIBRARIES),) 38 59 APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME) 39 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX) 60 else 61 APP_THIRD_PARTY_LIBS += -lgsmcodec 62 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libgsmcodec.$(SHLIB_SUFFIX) 63 endif 40 64 endif 41 65 endif … … 45 69 APP_THIRD_PARTY_EXT += -lspeex -lspeexdsp 46 70 else 71 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX) 72 ifeq ($(PJ_SHARED_LIBRARIES),) 47 73 APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME) 48 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX) 74 else 75 APP_THIRD_PARTY_LIBS += -lspeex 76 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libspeex.$(SHLIB_SUFFIX) 77 endif 49 78 endif 50 79 endif 51 80 52 81 ifneq (@ac_no_ilbc_codec@,1) 82 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec-$(LIB_SUFFIX) 83 ifeq ($(PJ_SHARED_LIBRARIES),) 53 84 APP_THIRD_PARTY_LIBS += -lilbccodec-$(TARGET_NAME) 54 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec-$(LIB_SUFFIX) 85 else 86 APP_THIRD_PARTY_LIBS += -lilbccodec 87 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libilbccodec.$(SHLIB_SUFFIX) 88 endif 55 89 endif 56 90 57 91 ifneq (@ac_no_g7221_codec@,1) 92 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec-$(LIB_SUFFIX) 93 ifeq ($(PJ_SHARED_LIBRARIES),) 58 94 APP_THIRD_PARTY_LIBS += -lg7221codec-$(TARGET_NAME) 59 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec-$(LIB_SUFFIX) 95 else 96 APP_THIRD_PARTY_LIBS += -lg7221codec 97 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libg7221codec.$(SHLIB_SUFFIX) 98 endif 60 99 endif 61 100 … … 65 104 APP_THIRD_PARTY_EXT += -lportaudio 66 105 else 106 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX) 107 ifeq ($(PJ_SHARED_LIBRARIES),) 67 108 APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME) 68 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX) 109 else 110 APP_THIRD_PARTY_LIBS += -lportaudio 111 APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX) 112 endif 69 113 endif 70 114 endif … … 123 167 $(PJ_VIDEO_LDFLAGS) \ 124 168 @LDFLAGS@ 125 export APP_LDLIBS := -lpjsua-$(TARGET_NAME)\126 -lpjsip-ua-$(TARGET_NAME)\127 -lpjsip-simple-$(TARGET_NAME)\128 -lpjsip-$(TARGET_NAME)\129 -lpjmedia-codec-$(TARGET_NAME)\130 -lpjmedia-videodev-$(TARGET_NAME)\131 -lpjmedia-$(TARGET_NAME)\132 -lpjmedia-audiodev-$(TARGET_NAME)\133 -lpjmedia-$(TARGET_NAME)\134 -lpjnath-$(TARGET_NAME)\135 -lpjlib-util-$(TARGET_NAME)\136 $(APP_THIRD_PARTY_LIBS)\137 $(APP_THIRD_PARTY_EXT)\138 -lpj-$(TARGET_NAME)\139 @LIBS@140 169 export APP_LIB_FILES = $(PJ_DIR)/pjsip/lib/libpjsua-$(LIB_SUFFIX) \ 141 170 $(PJ_DIR)/pjsip/lib/libpjsip-ua-$(LIB_SUFFIX) \ … … 151 180 $(PJ_DIR)/pjlib/lib/libpj-$(LIB_SUFFIX) 152 181 182 ifeq ($(PJ_SHARED_LIBRARIES),) 183 export PJLIB_LDLIB := -lpj-$(TARGET_NAME) 184 export PJLIB_UTIL_LDLIB := -lpjlib-util-$(TARGET_NAME) 185 export PJNATH_LDLIB := -lpjnath-$(TARGET_NAME) 186 export PJMEDIA_AUDIODEV_LDLIB := -lpjmedia-audiodev-$(TARGET_NAME) 187 export PJMEDIA_VIDEODEV_LDLIB := -lpjmedia-videodev-$(TARGET_NAME) 188 export PJMEDIA_LDLIB := -lpjmedia-$(TARGET_NAME) 189 export PJMEDIA_CODEC_LDLIB := -lpjmedia-codec-$(TARGET_NAME) 190 export PJSIP_LDLIB := -lpjsip-$(TARGET_NAME) 191 export PJSIP_SIMPLE_LDLIB := -lpjsip-simple-$(TARGET_NAME) 192 export PJSIP_UA_LDLIB := -lpjsip-ua-$(TARGET_NAME) 193 export PJSUA_LIB_LDLIB := -lpjsua-$(TARGET_NAME) 194 else 195 export PJLIB_LDLIB := -lpj 196 export PJLIB_UTIL_LDLIB := -lpjlib-util 197 export PJNATH_LDLIB := -lpjnath 198 export PJMEDIA_AUDIODEV_LDLIB := -lpjmedia-audiodev 199 export PJMEDIA_VIDEODEV_LDLIB := -lpjmedia-videodev 200 export PJMEDIA_LDLIB := -lpjmedia 201 export PJMEDIA_CODEC_LDLIB := -lpjmedia-codec 202 export PJSIP_LDLIB := -lpjsip 203 export PJSIP_SIMPLE_LDLIB := -lpjsip-simple 204 export PJSIP_UA_LDLIB := -lpjsip-ua 205 export PJSUA_LIB_LDLIB := -lpjsua 206 207 APP_LIB_FILES += $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX) \ 208 $(PJ_DIR)/pjsip/lib/libpjsip-ua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsip-ua.$(SHLIB_SUFFIX) \ 209 $(PJ_DIR)/pjsip/lib/libpjsip-simple.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsip-simple.$(SHLIB_SUFFIX) \ 210 $(PJ_DIR)/pjsip/lib/libpjsip.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsip.$(SHLIB_SUFFIX) \ 211 $(PJ_DIR)/pjmedia/lib/libpjmedia-codec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjmedia/lib/libpjmedia-codec.$(SHLIB_SUFFIX) \ 212 $(PJ_DIR)/pjmedia/lib/libpjmedia-videodev.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjmedia/lib/libpjmedia-videodev.$(SHLIB_SUFFIX) \ 213 $(PJ_DIR)/pjmedia/lib/libpjmedia.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjmedia/lib/libpjmedia.$(SHLIB_SUFFIX) \ 214 $(PJ_DIR)/pjmedia/lib/libpjmedia-audiodev.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjmedia/lib/libpjmedia-audiodev.$(SHLIB_SUFFIX) \ 215 $(PJ_DIR)/pjnath/lib/libpjnath.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjnath/lib/libpjnath.$(SHLIB_SUFFIX) \ 216 $(PJ_DIR)/pjlib-util/lib/libpjlib-util.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjlib-util/lib/libpjlib-util.$(SHLIB_SUFFIX) \ 217 $(PJ_DIR)/pjlib/lib/libpj.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjlib/lib/libpj.$(SHLIB_SUFFIX) 218 endif 219 220 export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \ 221 $(PJSIP_UA_LDLIB) \ 222 $(PJSIP_SIMPLE_LDLIB) \ 223 $(PJSIP_LDLIB) \ 224 $(PJMEDIA_CODEC_LDLIB) \ 225 $(PJMEDIA_LDLIB) \ 226 $(PJMEDIA_VIDEODEV_LDLIB) \ 227 $(PJMEDIA_AUDIODEV_LDLIB) \ 228 $(PJNATH_LDLIB) \ 229 $(PJLIB_UTIL_LDLIB) \ 230 $(APP_THIRD_PARTY_LIBS)\ 231 $(APP_THIRD_PARTY_EXT)\ 232 $(PJLIB_LDLIB) \ 233 @LIBS@ 234 153 235 # Here are the variabels to use if application is using the library 154 236 # from within the source distribution … … 164 246 # library from the install location (i.e. --prefix) 165 247 export PJ_INSTALL_DIR := @prefix@ 166 export PJ_INSTALL_INC_DIR := $(PJ_INSTALL_DIR)/include167 export PJ_INSTALL_LIB_DIR := $(PJ_INSTALL_DIR)/lib248 export PJ_INSTALL_INC_DIR := @includedir@ 249 export PJ_INSTALL_LIB_DIR := @libdir@ 168 250 export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1 @CFLAGS@ 169 251 export PJ_INSTALL_CXXFLAGS := $(PJ_INSTALL_CFLAGS) -
pjproject/trunk/build/rules.mak
r4637 r4656 7 7 8 8 # 9 # The full path of output lib file (e.g. ../lib/libapp.a). 10 # 11 LIB = $($(APP)_LIB) 12 13 # 14 # The full path of output lib file (e.g. ../lib/libapp.a). 15 # 9 # The name(s) of output lib file(s) (e.g. libapp.a). 10 # 11 LIB := $($(APP)_LIB) 16 12 SHLIB = $($(APP)_SHLIB) 17 18 # 19 # The full path of output executable file (e.g. ../bin/app.exe). 13 SONAME = $($(APP)_SONAME) 14 15 ifeq ($(SHLIB_SUFFIX),so) 16 SHLIB_OPT := -shared -Wl,-soname,$(SHLIB) 17 else ifeq ($(SHLIB_SUFFIX),dylib) 18 SHLIB_OPT := -dynamiclib -undefined dynamic_lookup -flat_namespace 19 else 20 SHLIB_OPT := 21 endif 22 23 # 24 # The name of output executable file (e.g. app.exe). 20 25 # 21 26 EXE = $($(APP)_EXE) … … 77 82 78 83 print_bin: print_common 79 @echo EXE=$( EXE)84 @echo EXE=$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)) 80 85 @echo BINDIR=$(BINDIR) 81 86 82 87 print_lib: print_common 83 @echo LIB=$(LIB) 88 ifneq ($(LIB),) 89 @echo LIB=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(LIB)) 90 endif 91 ifneq ($(SHLIB),) 92 @echo SHLIB=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB)) 93 endif 94 ifneq ($(SONAME),) 95 @echo SONAME=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SONAME)) 96 endif 84 97 @echo LIBDIR=$(LIBDIR) 85 98 86 $(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 99 ifneq ($(LIB),) 100 $(subst /,$(HOST_PSEP),$(LIBDIR)/$(LIB)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 87 101 if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi 88 $(AR) $(AR_FLAGS) $(LIB) $(OBJS) 89 $(RANLIB) $(LIB) 90 91 $(SHLIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 102 $(AR) $(AR_FLAGS) $@ $(OBJS) 103 $(RANLIB) $@ 104 endif 105 106 ifneq ($(SHLIB),) 107 $(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 92 108 if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi 93 $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(SHLIB)) \ 109 $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \ 110 $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS) $(SHLIB_OPT) 111 endif 112 113 ifneq ($(SONAME),) 114 $(subst /,$(HOST_PSEP),$(LIBDIR)/$(SONAME)): $(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB)) 115 ln -sf $(SHLIB) $@ 116 endif 117 118 ifneq ($(EXE),) 119 $(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 120 if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi 121 $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)) \ 94 122 $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS) 95 96 $(EXE): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 97 if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi 98 $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(EXE)) \ 99 $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS) 123 endif 100 124 101 125 $(OBJDIR)/$(app).o: $(OBJDIRS) $(OBJS) … … 148 172 149 173 $(OBJDIRS): 150 $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 174 $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 151 175 152 176 $(LIBDIR): 153 $(subst @@,$(subst /,$(HOST_PSEP),$ (LIBDIR)),$(HOST_MKDIR))177 $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 154 178 155 179 $(BINDIR): 156 $(subst @@,$(subst /,$(HOST_PSEP),$ (BINDIR)),$(HOST_MKDIR))180 $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 157 181 158 182 clean: … … 169 193 170 194 realclean: clean 171 $(subst @@,$(subst /,$(HOST_PSEP),$(LIB)) $(subst /,$(HOST_PSEP),$(EXE)),$(HOST_RM)) 195 ifneq ($(LIB),) 196 $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)/$(LIB)),$(HOST_RM)) 197 endif 198 ifneq ($(SHLIB),) 199 $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB)),$(HOST_RM)) 200 endif 201 ifneq ($(SONAME),) 202 $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SONAME)),$(HOST_RM)) 203 endif 204 ifneq ($(EXE),) 205 $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)),$(HOST_RM)) 206 endif 172 207 $(subst @@,$(DEP_FILE),$(HOST_RM)) 173 208 ifeq ($(OS_NAME),linux-kernel) -
pjproject/trunk/libpjproject.pc.in
r3063 r4656 3 3 prefix=@PREFIX@ 4 4 exec_prefix=${prefix} 5 libdir= ${exec_prefix}/lib6 includedir= ${prefix}/include5 libdir=@LIBDIR@ 6 includedir=@INCLUDEDIR@ 7 7 8 8 Name: libpjproject -
pjproject/trunk/pjlib-util/build/Makefile
r4637 r4656 7 7 include $(PJDIR)/build/common.mak 8 8 9 export LIBDIR := ../lib 10 export BINDIR := ../bin 11 9 12 RULES_MAK := $(PJDIR)/build/rules.mak 10 13 11 14 PJLIB_LIB:=$(PJDIR)/pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) 12 export PJLIB_UTIL_LIB:=../lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) 15 16 export PJLIB_UTIL_LIB := libpjlib-util-$(TARGET_NAME)$(LIBEXT) 17 18 ifeq ($(PJ_SHARED_LIBRARIES),) 19 else 20 export PJLIB_UTIL_SONAME := libpjlib-util.$(SHLIB_SUFFIX) 21 export PJLIB_UTIL_SHLIB := $(PJLIB_UTIL_SONAME).$(PJ_VERSION_MAJOR) 22 endif 13 23 14 24 ############################################################################### … … 19 29 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 20 30 $(HOST_CXXFLAGS) $(CXXFLAGS) 21 export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \ 22 $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \ 23 $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 24 $(LDFLAGS) 31 export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 32 $(APP_LDFLAGS) $(LDFLAGS) 25 33 26 34 ############################################################################### … … 36 44 export PJLIB_UTIL_CFLAGS += $(_CFLAGS) 37 45 export PJLIB_UTIL_CXXFLAGS += $(_CXXFLAGS) 46 export PJLIB_UTIL_LDFLAGS += $(PJLIB_LDLIB) $(_LDFLAGS) 38 47 39 48 ############################################################################### … … 45 54 export UTIL_TEST_CFLAGS += $(_CFLAGS) 46 55 export UTIL_TEST_CXXFLAGS += $(_CXXFLAGS) 47 export UTIL_TEST_LDFLAGS += $( _LDFLAGS)48 export UTIL_TEST_EXE:= ../bin/pjlib-util-test-$(TARGET_NAME)$(HOST_EXE)56 export UTIL_TEST_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) 57 export UTIL_TEST_EXE:=pjlib-util-test-$(TARGET_NAME)$(HOST_EXE) 49 58 50 59 … … 55 64 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 56 65 # 57 TARGETS := pjlib-util pjlib-util-test66 TARGETS := $(PJLIB_UTIL_LIB) $(PJLIB_UTIL_SONAME) $(UTIL_TEST_EXE) 58 67 59 68 all: $(TARGETS) … … 73 82 distclean: realclean 74 83 75 .PHONY: dep depend clean realclean distclean84 .PHONY: all dep depend clean realclean distclean 76 85 .PHONY: $(TARGETS) 77 .PHONY: $(PJLIB_UTIL_LIB) $(UTIL_TEST_EXE) 86 .PHONY: $(PJLIB_UTIL_LIB) $(PJLIB_UTIL_SONAME) 87 .PHONY: $(UTIL_TEST_EXE) 78 88 79 pjlib-util: $(PJLIB_UTIL_LIB) 80 $(PJLIB_UTIL_LIB): 81 $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $(PJLIB_UTIL_LIB) 89 pjlib-util: $(PJLIB_UTIL_LIB) $(PJLIB_UTIL_SONAME) 90 $(PJLIB_UTIL_SONAME): $(PJLIB_UTIL_LIB) 91 $(PJLIB_UTIL_LIB) $(PJLIB_UTIL_SONAME): $(PJLIB_LIB) $(PJLIB_SONAME) 92 $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 82 93 83 94 pjlib-util-test: $(UTIL_TEST_EXE) 84 $(UTIL_TEST_EXE): $(PJLIB_UTIL_LIB) 85 $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $( UTIL_TEST_EXE)95 $(UTIL_TEST_EXE): $(PJLIB_UTIL_LIB) $(PJLIB_UTIL_SONAME) 96 $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 86 97 87 .PHONY: ../lib/pjlib-util.ko88 ../lib/pjlib-util.ko:98 .PHONY: pjlib-util.ko 99 pjlib-util.ko: 89 100 echo Making $@ 90 $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $ @101 $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 91 102 92 .PHONY: ../lib/pjlib-util-test.ko93 ../lib/pjlib-util-test.ko:94 $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $ @103 .PHONY: pjlib-util-test.ko 104 pjlib-util-test.ko: 105 $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 95 106 96 107 clean: … … 107 118 $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $@ 108 119 $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $@ 109 echo '$( UTIL_TEST_EXE):$(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjlib-util-test-$(TARGET_NAME).depend; \120 echo '$(BINDIR)/$(UTIL_TEST_EXE): $(LIBDIR)/$(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjlib-util-test-$(TARGET_NAME).depend; \ 110 121 111 -
pjproject/trunk/pjlib/build/Makefile
r4637 r4656 3 3 include $(PJDIR)/build/common.mak 4 4 5 export LIBDIR := ../lib 6 export BINDIR := ../bin 7 5 8 RULES_MAK := $(PJDIR)/build/rules.mak 6 9 10 export PJLIB_LIB := libpj-$(TARGET_NAME)$(LIBEXT) 7 11 8 export PJLIB_LIB := ../lib/libpj-$(TARGET_NAME)$(LIBEXT) 12 ifeq ($(PJ_SHARED_LIBRARIES),) 13 else 14 export PJLIB_SONAME := libpj.$(SHLIB_SUFFIX) 15 export PJLIB_SHLIB := $(PJLIB_SONAME).$(PJ_VERSION_MAJOR) 16 endif 9 17 10 18 ############################################################################### … … 15 23 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 16 24 $(HOST_CXXFLAGS) $(CXXFLAGS) 17 export _LDFLAGS := $( subst /,$(HOST_PSEP),$(PJLIB_LIB)) \18 $( CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \19 $(LDFLAGS) 25 export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 26 $(APP_LDFLAGS) $(LDFLAGS) 27 20 28 21 29 ############################################################################### … … 32 40 export PJLIB_CFLAGS += $(_CFLAGS) 33 41 export PJLIB_CXXFLAGS += $(_CXXFLAGS) 42 export PJLIB_LDFLAGS += $(_LDFLAGS) 34 43 35 44 ############################################################################### … … 47 56 export TEST_CFLAGS += $(_CFLAGS) 48 57 export TEST_CXXFLAGS += $(_CXXFLAGS) 49 export TEST_LDFLAGS += $( _LDFLAGS)50 export TEST_EXE := ../bin/pjlib-test-$(TARGET_NAME)$(HOST_EXE)58 export TEST_LDFLAGS += $(PJLIB_LDLIB) $(_LDFLAGS) 59 export TEST_EXE := pjlib-test-$(TARGET_NAME)$(HOST_EXE) 51 60 52 61 53 62 export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 54 63 ############################################################################### … … 77 86 $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib depend 78 87 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test depend 79 echo '$( TEST_EXE):$(PJLIB_LIB)' >> .pjlib-test-$(TARGET_NAME).depend88 echo '$(BINDIR)/$(TEST_EXE): $(LIBDIR)/$(PJLIB_LIB)' >> .pjlib-test-$(TARGET_NAME).depend 80 89 81 90 82 .PHONY: dep depend clean realclean distclean91 .PHONY: all dep depend clean realclean distclean 83 92 .PHONY: $(TARGETS) 84 .PHONY: $(PJLIB_LIB) $(TEST_EXE) 93 .PHONY: $(PJLIB_LIB) $(PJLIB_SONAME) 94 .PHONY: $(TEST_EXE) 85 95 86 96 dep: depend … … 88 98 pjlib: $(PJLIB_LIB) 89 99 $(PJLIB_LIB): ../include/pj/config_site.h 90 $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib $(PJLIB_LIB) 100 101 $(PJLIB_SONAME): $(PJLIB_LIB) 102 $(PJLIB_LIB) $(PJLIB_SONAME): 103 $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 91 104 92 105 ../include/pj/config_site.h: … … 94 107 95 108 pjlib-test: $(TEST_EXE) 96 $(TEST_EXE): $(PJLIB_LIB) 97 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test $( TEST_EXE)109 $(TEST_EXE): $(PJLIB_LIB) $(PJLIB_SONAME) 110 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 98 111 99 .PHONY: ../lib/pjlib.ko100 ../lib/pjlib.ko:112 .PHONY: pjlib.ko 113 pjlib.ko: 101 114 echo Making $@ 102 $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib $ @115 $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 103 116 104 .PHONY: ../lib/pjlib-test.ko105 ../lib/pjlib-test.ko:106 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test $ @117 .PHONY: pjlib-test.ko 118 pjlib-test.ko: 119 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 107 120 108 121 clean: -
pjproject/trunk/pjlib/build/os-auto.mak.in
r3295 r4656 30 30 # operating system. 31 31 # 32 export TARGETS = pjlib pjlib-test32 export TARGETS = $(PJLIB_LIB) $(PJLIB_SONAME) $(TEST_EXE) 33 33 34 34 -
pjproject/trunk/pjlib/build/os-darwinos.mak
r447 r4656 34 34 # operating system. 35 35 # 36 export TARGETS = pjlib pjlib-test36 export TARGETS = $(PJLIB_LIB) $(PJLIB_SONAME) $(TEST_EXE) 37 37 -
pjproject/trunk/pjlib/build/os-linux-kernel.mak
r65 r4656 43 43 # operating system. 44 44 # 45 export TARGETS := ../lib/pjlib.ko ../lib/pjlib-test.ko45 export TARGETS := pjlib.ko pjlib-test.ko 46 46 47 47 -
pjproject/trunk/pjlib/build/os-linux.mak
r447 r4656 36 36 # operating system. 37 37 # 38 export TARGETS = pjlib pjlib-test38 export TARGETS = $(PJLIB_LIB) $(PJLIB_SONAME) $(TEST_EXE) 39 39 -
pjproject/trunk/pjlib/build/os-rtems.mak
r433 r4656 41 41 # operating system. 42 42 # 43 export TARGETS = pjlib pjlib-test43 export TARGETS = $(PJLIB_LIB) $(TEST_EXE) 44 44 45 45 -
pjproject/trunk/pjlib/build/os-sunos.mak
r447 r4656 33 33 # operating system. 34 34 # 35 export TARGETS = pjlib pjlib-test35 export TARGETS = $(PJLIB_LIB) $(PJLIB_SONAME) $(TEST_EXE) 36 36 -
pjproject/trunk/pjlib/build/os-win32.mak
r3052 r4656 30 30 # operating system. 31 31 # 32 export TARGETS = pjlib pjlib-test32 export TARGETS = $(PJLIB_LIB) $(TEST_EXE) 33 33 -
pjproject/trunk/pjmedia/build/Makefile
r4637 r4656 10 10 include $(PJDIR)/build/common.mak 11 11 12 export LIBDIR := ../lib 13 export BINDIR := ../bin 14 12 15 RULES_MAK := $(PJDIR)/build/rules.mak 13 16 … … 16 19 PJNATH_LIB:=$(PJDIR)/pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT) 17 20 18 export PJMEDIA_LIB:=../lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) 19 export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) 20 export PJSDP_LIB:=../lib/libpjsdp-$(TARGET_NAME)$(LIBEXT) 21 export PJMEDIA_AUDIODEV_LIB:=../lib/libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT) 22 export PJMEDIA_VIDEODEV_LIB:=../lib/libpjmedia-videodev-$(TARGET_NAME)$(LIBEXT) 21 export PJMEDIA_LIB:=libpjmedia-$(TARGET_NAME)$(LIBEXT) 22 export PJMEDIA_CODEC_LIB:=libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) 23 export PJSDP_LIB:=libpjsdp-$(TARGET_NAME)$(LIBEXT) 24 export PJMEDIA_AUDIODEV_LIB:=libpjmedia-audiodev-$(TARGET_NAME)$(LIBEXT) 25 export PJMEDIA_VIDEODEV_LIB:=libpjmedia-videodev-$(TARGET_NAME)$(LIBEXT) 26 27 ifeq ($(PJ_SHARED_LIBRARIES),) 28 else 29 export PJMEDIA_SONAME:=libpjmedia.$(SHLIB_SUFFIX) 30 export PJMEDIA_SHLIB:=$(PJMEDIA_SONAME).$(PJ_VERSION_MAJOR) 31 export PJMEDIA_CODEC_SONAME:=libpjmedia-codec.$(SHLIB_SUFFIX) 32 export PJMEDIA_CODEC_SHLIB:=$(PJMEDIA_CODEC_SONAME).$(PJ_VERSION_MAJOR) 33 export PJSDP_SONAME:=libpjsdp.$(SHLIB_SUFFIX) 34 export PJSDP_SHLIB:=$(PJSDP_SONAME).$(PJ_VERSION_MAJOR) 35 export PJMEDIA_AUDIODEV_SONAME:=libpjmedia-audiodev.$(SHLIB_SUFFIX) 36 export PJMEDIA_AUDIODEV_SHLIB:=$(PJMEDIA_AUDIODEV_SONAME).$(PJ_VERSION_MAJOR) 37 export PJMEDIA_VIDEODEV_SONAME:=libpjmedia-videodev.$(SHLIB_SUFFIX) 38 export PJMEDIA_VIDEODEV_SHLIB:=$(PJMEDIA_VIDEODEV_SONAME).$(PJ_VERSION_MAJOR) 39 endif 23 40 24 41 … … 36 53 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 37 54 $(HOST_CXXFLAGS) $(CXXFLAGS) 38 export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJMEDIA_VIDEODEV_LIB)) \ 39 $(subst /,$(HOST_PSEP),$(PJMEDIA_CODEC_LIB)) \ 40 $(subst /,$(HOST_PSEP),$(PJMEDIA_LIB)) \ 41 $(subst /,$(HOST_PSEP),$(PJMEDIA_AUDIODEV_LIB)) \ 42 $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \ 43 $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \ 44 $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \ 45 -L$(PJDIR)/third_party/lib \ 46 $(APP_THIRD_PARTY_LIBS) \ 55 56 export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \ 47 57 $(APP_THIRD_PARTY_EXT) \ 48 58 $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 49 $( LDFLAGS)59 $(APP_LDFLAGS) $(LDFLAGS) 50 60 51 61 ############################################################################### … … 75 85 export PJMEDIA_CFLAGS += $(_CFLAGS) 76 86 export PJMEDIA_CXXFLAGS += $(_CXXFLAGS) 87 export PJMEDIA_LDFLAGS += $(PJMEDIA_VIDEODEV_LDLIB) \ 88 $(PJMEDIA_AUDIODEV_LDLIB) \ 89 $(PJLIB_LDLIB) \ 90 $(PJLIB_UTIL_LDLIB) \ 91 $(PJNATH_LDLIB) \ 92 $(_LDFLAGS) 77 93 78 94 … … 87 103 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS) 88 104 export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS) 105 export PJMEDIA_AUDIODEV_LDFLAGS += $(PJLIB_LDLIB) \ 106 $(_LDFLAGS) 89 107 90 108 … … 97 115 export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS) 98 116 export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS) 117 export PJMEDIA_VIDEODEV_LDFLAGS += $(PJLIB_LDLIB) \ 118 $(_LDFLAGS) 99 119 100 120 … … 110 130 export PJSDP_CFLAGS += $(_CFLAGS) 111 131 export PJSDP_CXXFLAGS += $(_CXXFLAGS) 132 export PJSDP_LDFLAGS += $(PJMEDIA_LDLIB) \ 133 $(PJLIB_LDLIB) \ 134 $(PJLIB_UTIL_LDLIB) \ 135 $(_LDFLAGS) 112 136 113 137 … … 125 149 export PJMEDIA_CODEC_CXXFLAGS += $(_CXXFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \ 126 150 $(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS) 127 151 export PJMEDIA_CODEC_LDFLAGS += $(PJMEDIA_LDLIB) \ 152 $(PJLIB_LDLIB) \ 153 $(_LDFLAGS) 128 154 129 155 ############################################################################### … … 137 163 export PJMEDIA_TEST_CFLAGS += $(_CFLAGS) 138 164 export PJMEDIA_TEST_CXXFLAGS += $(_CXXFLAGS) 139 export PJMEDIA_TEST_LDFLAGS += $(_LDFLAGS) 140 export PJMEDIA_TEST_EXE:=../bin/pjmedia-test-$(TARGET_NAME)$(HOST_EXE) 165 export PJMEDIA_TEST_LDFLAGS += $(PJMEDIA_CODEC_LDLIB) \ 166 $(PJMEDIA_VIDEODEV_LDLIB) \ 167 $(PJMEDIA_LDLIB) \ 168 $(PJMEDIA_AUDIODEV_LDLIB) \ 169 $(PJLIB_LDLIB) \ 170 $(PJLIB_UTIL_LDLIB) \ 171 $(PJNATH_LDLIB) \ 172 $(_LDFLAGS) 173 export PJMEDIA_TEST_EXE:=pjmedia-test-$(TARGET_NAME)$(HOST_EXE) 141 174 142 175 … … 147 180 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 148 181 # 149 TARGETS := pjmedia pjmedia-videodev pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test 182 TARGETS := $(PJMEDIA_LIB) $(PJMEDIA_SONAME) \ 183 $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME)\ 184 $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME) \ 185 $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) \ 186 $(PJSDP_LIB) $(PJSDP_SONAME) \ 187 $(PJMEDIA_TEST_EXE) 150 188 151 189 all: $(TARGETS) … … 165 203 distclean: realclean 166 204 167 .PHONY: dep depend clean realclean distclean205 .PHONY: all dep depend clean realclean distclean 168 206 .PHONY: $(TARGETS) 169 .PHONY: $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_AUDIODEV_LIB) $(PJSDP_LIB) $(PJMEDIA_TEST_EXE) 207 .PHONY: $(PJMEDIA_LIB) $(PJMEDIA_SONAME) 208 .PHONY: $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME) 209 .PHONY: $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME) 210 .PHONY: $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) 211 .PHONY: $(PJSDP_LIB) $(PJSDP_SONAME) 212 .PHONY: $(PJMEDIA_TEST_EXE) 170 213 171 214 pjmedia: $(PJMEDIA_LIB) 172 $(PJMEDIA_LIB): 173 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(PJMEDIA_LIB) 215 $(PJMEDIA_SONAME): $(PJMEDIA_LIB) 216 $(PJMEDIA_LIB) $(PJMEDIA_SONAME): $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME) 217 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 174 218 175 219 pjmedia-codec: $(PJMEDIA_CODEC_LIB) 176 $(PJMEDIA_CODEC_LIB): 177 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(PJMEDIA_CODEC_LIB) 220 $(PJMEDIA_CODEC_SONAME): $(PJMEDIA_CODEC_LIB) 221 $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME) 222 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 178 223 179 224 pjmedia-videodev: $(PJMEDIA_VIDEODEV_LIB) 180 $(PJMEDIA_VIDEODEV_LIB): 181 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(PJMEDIA_VIDEODEV_LIB) 225 $(PJMEDIA_VIDEODEV_SONAME): $(PJMEDIA_VIDEODEV_LIB) 226 $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME): 227 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_VIDEODEV app=pjmedia-videodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 182 228 183 229 pjmedia-audiodev: $(PJMEDIA_AUDIODEV_LIB) 184 $(PJMEDIA_AUDIODEV_LIB): 185 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(PJMEDIA_AUDIODEV_LIB) 230 $(PJMEDIA_AUDIODEV_SONAME): $(PJMEDIA_AUDIODEV_LIB) 231 $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME): 232 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_AUDIODEV app=pjmedia-audiodev $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 186 233 187 234 pjsdp: $(PJSDP_LIB) 188 $(PJSDP_LIB): 189 $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $(PJSDP_LIB) 235 $(PJSDP_SONAME): $(PJSDP_LIB) 236 $(PJSDP_LIB) $(PJSDP_SONAME): $(PJMEDIA_LIB) $(PJMEDIA_SONAME) 237 $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $(LIBDIR)/$@ 190 238 191 239 pjmedia-test: $(PJMEDIA_TEST_EXE) 192 $(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) 193 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $(PJMEDIA_TEST_EXE) 194 195 .PHONY: ../lib/pjmedia.ko 196 ../lib/pjmedia.ko: 240 $(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_SONAME) 241 $(PJMEDIA_TEST_EXE): $(PJMEDIA_AUDIODEV_LIB) $(PJMEDIA_AUDIODEV_SONAME) 242 $(PJMEDIA_TEST_EXE): $(PJMEDIA_VIDEODEV_LIB) $(PJMEDIA_VIDEODEV_SONAME) 243 $(PJMEDIA_TEST_EXE): $(PJMEDIA_CODEC_LIB) $(PJMEDIA_CODEC_SONAME) 244 $(PJMEDIA_TEST_EXE): 245 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $(BINDIR)/$@ 246 247 .PHONY: pjmedia.ko 248 pjmedia.ko: 197 249 echo Making $@ 198 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $ @199 200 .PHONY: ../lib/pjmedia-codec.ko201 ../lib/pjmedia-codec.ko:250 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA app=pjmedia $(LIBDIR)/$@ 251 252 .PHONY: pjmedia-codec.ko 253 pjmedia-codec.ko: 202 254 echo Making $@ 203 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $ @204 205 .PHONY: ../lib/pjmedia-test.ko206 ../lib/pjmedia-test.ko:207 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $ @255 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $(LIBDIR)/$@ 256 257 .PHONY: pjmedia-test.ko 258 pjmedia-test.ko: 259 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $(LIBDIR)/$@ 208 260 209 261 clean: … … 237 289 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@ 238 290 $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $@ 239 echo '$( PJMEDIA_TEST_EXE): $(PJMEDIA_LIB)$(PJMEDIA_CODEC_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjmedia-test-$(TARGET_NAME).depend240 241 291 echo '$(BINDIR)/$(PJMEDIA_TEST_EXE): $(LIBDIR)/$(PJMEDIA_LIB) $(LIBDIR)/$(PJMEDIA_CODEC_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjmedia-test-$(TARGET_NAME).depend 292 293 -
pjproject/trunk/pjmedia/include/pjmedia-videodev/config.h
r4414 r4656 53 53 54 54 55 #if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) 56 55 57 /** 56 58 * This setting controls whether SDL support should be included. … … 145 147 #endif 146 148 149 #endif /* defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0) */ 150 147 151 /** 148 152 * @} -
pjproject/trunk/pjnath/build/Makefile
r4637 r4656 7 7 include $(PJDIR)/build/common.mak 8 8 9 export LIBDIR := ../lib 10 export BINDIR := ../bin 11 9 12 RULES_MAK := $(PJDIR)/build/rules.mak 10 13 11 14 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) 12 15 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) 13 export PJNATH_LIB:=../lib/libpjnath-$(TARGET_NAME)$(LIBEXT) 16 17 export PJNATH_LIB:=libpjnath-$(TARGET_NAME)$(LIBEXT) 18 19 ifeq ($(PJ_SHARED_LIBRARIES),) 20 else 21 export PJNATH_SONAME := libpjnath.$(SHLIB_SUFFIX) 22 export PJNATH_SHLIB := $(PJNATH_SONAME).$(PJ_VERSION_MAJOR) 23 endif 14 24 15 25 ############################################################################### … … 21 31 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 22 32 $(HOST_CXXFLAGS) $(CXXFLAGS) 23 export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \ 24 $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \ 25 $(subst /,$(HOST_PSEP),$(PJLIB_LIB)) \ 26 $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 27 $(LDFLAGS) 33 export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 34 $(APP_LDFLAGS) $(LDFLAGS) 28 35 29 36 ############################################################################### … … 37 44 export PJNATH_CFLAGS += $(_CFLAGS) 38 45 export PJNATH_CXXFLAGS += $(_CXXFLAGS) 46 export PJNATH_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) 39 47 40 48 ############################################################################### … … 46 54 export PJNATH_TEST_CFLAGS += $(_CFLAGS) 47 55 export PJNATH_TEST_CXXFLAGS += $(_CXXFLAGS) 48 export PJNATH_TEST_LDFLAGS += $( _LDFLAGS)49 export PJNATH_TEST_EXE:= ../bin/pjnath-test-$(TARGET_NAME)$(HOST_EXE)56 export PJNATH_TEST_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) 57 export PJNATH_TEST_EXE:=pjnath-test-$(TARGET_NAME)$(HOST_EXE) 50 58 51 59 … … 57 65 export PJTURN_CLIENT_CFLAGS += $(_CFLAGS) 58 66 export PJTURN_CLIENT_CXXFLAGS += $(_CXXFLAGS) 59 export PJTURN_CLIENT_LDFLAGS += $( _LDFLAGS)60 export PJTURN_CLIENT_EXE:= ../bin/pjturn-client-$(TARGET_NAME)$(HOST_EXE)67 export PJTURN_CLIENT_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) 68 export PJTURN_CLIENT_EXE:=pjturn-client-$(TARGET_NAME)$(HOST_EXE) 61 69 62 70 ############################################################################### … … 68 76 export PJTURN_SRV_CFLAGS += $(_CFLAGS) 69 77 export PJTURN_SRV_CXXFLAGS += $(_CXXFLAGS) 70 export PJTURN_SRV_LDFLAGS += $( _LDFLAGS)71 export PJTURN_SRV_EXE:= ../bin/pjturn-srv-$(TARGET_NAME)$(HOST_EXE)78 export PJTURN_SRV_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) 79 export PJTURN_SRV_EXE:=pjturn-srv-$(TARGET_NAME)$(HOST_EXE) 72 80 73 81 … … 79 87 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 80 88 # 81 TARGETS := pjnath pjnath-test pjturn-client pjturn-srv89 TARGETS := $(PJNATH_LIB) $(PJNATH_SONAME) $(PJNATH_TEST_EXE) $(PJTURN_CLIENT_EXE) $(PJTURN_SRV_EXE) 82 90 83 91 all: $(TARGETS) … … 97 105 distclean: realclean 98 106 99 .PHONY: dep depend clean realclean distclean107 .PHONY: all dep depend clean realclean distclean 100 108 .PHONY: $(TARGETS) 101 .PHONY: $(PJNATH_LIB) $(PJNATH_TEST_EXE) $(PJTURN_CLIENT_EXE) $(PJTURN_SRV_EXE) 109 .PHONY: $(PJNATH_LIB) $(PJNATH_SONAME) 110 .PHONY: $(PJNATH_TEST_EXE) $(PJTURN_CLIENT_EXE) $(PJTURN_SRV_EXE) 102 111 103 112 pjnath: $(PJNATH_LIB) 104 $(PJNATH_LIB): 105 $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $(PJNATH_LIB) 113 $(PJNATH_SONAME): $(PJNATH_LIB) 114 $(PJNATH_LIB) $(PJNATH_SONAME): $(PJLIB_LIB) $(PJLIB_SONAME) $(PJLIB_UTIL_LIB) $(PJLIB_UTIL_SONAME) 115 $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 106 116 107 117 pjnath-test: $(PJNATH_TEST_EXE) 108 $(PJNATH_TEST_EXE): $(PJNATH_LIB) 109 $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $( PJNATH_TEST_EXE)118 $(PJNATH_TEST_EXE): $(PJNATH_LIB) $(PJNATH_SONAME) 119 $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 110 120 111 121 pjturn-client: $(PJTURN_CLIENT_EXE) 112 $(PJTURN_CLIENT_EXE): $(PJNATH_LIB) 113 $(MAKE) -f $(RULES_MAK) APP=PJTURN_CLIENT app=pjturn-client $( PJTURN_CLIENT_EXE)122 $(PJTURN_CLIENT_EXE): $(PJNATH_LIB) $(PJNATH_SONAME) 123 $(MAKE) -f $(RULES_MAK) APP=PJTURN_CLIENT app=pjturn-client $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 114 124 115 125 pjturn-srv: $(PJTURN_SRV_EXE) 116 $(PJTURN_SRV_EXE): $(PJNATH_LIB) 117 $(MAKE) -f $(RULES_MAK) APP=PJTURN_SRV app=pjturn-srv $( PJTURN_SRV_EXE)126 $(PJTURN_SRV_EXE): $(PJNATH_LIB) $(PJNATH_SONAME) 127 $(MAKE) -f $(RULES_MAK) APP=PJTURN_SRV app=pjturn-srv $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 118 128 119 .PHONY: ../lib/pjnath.ko120 ../lib/pjnath.ko:129 .PHONY: pjnath.ko 130 pjnath.ko: 121 131 echo Making $@ 122 $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $ @132 $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 123 133 124 .PHONY: ../lib/pjnath-test.ko125 ../lib/pjnath-test.ko:126 $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $ @134 .PHONY: pjnath-test.ko 135 pjnath-test.ko: 136 $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 127 137 128 138 clean: … … 147 157 $(MAKE) -f $(RULES_MAK) APP=PJTURN_CLIENT app=pjturn-client $@ 148 158 $(MAKE) -f $(RULES_MAK) APP=PJTURN_SRV app=pjturn-srv $@ 149 echo '$( PJNATH_TEST_EXE):$(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjnath-test-$(TARGET_NAME).depend150 echo '$( PJTURN_CLIENT_EXE):$(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjturn-client-$(TARGET_NAME).depend151 echo '$( PJTURN_SRV_EXE):$(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjturn-srv-$(TARGET_NAME).depend159 echo '$(BINDIR)/$(PJNATH_TEST_EXE): $(LIBDIR)/$(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjnath-test-$(TARGET_NAME).depend 160 echo '$(BINDIR)/$(PJTURN_CLIENT_EXE): $(LIBDIR)/$(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjturn-client-$(TARGET_NAME).depend 161 echo '$(BINDIR)/$(PJTURN_SRV_EXE): $(LIBDIR)/$(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjturn-srv-$(TARGET_NAME).depend 152 162 153 163 -
pjproject/trunk/pjsip-apps/build/Makefile
r4637 r4656 2 2 include $(PJDIR)/build/common.mak 3 3 4 export LIBDIR := ../lib 5 export BINDIR := ../bin 4 6 5 7 RULES_MAK := $(PJDIR)/build/rules.mak … … 28 30 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 29 31 $(HOST_CXXFLAGS) $(CXXFLAGS) 32 export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 33 $(APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS) 30 34 31 35 ############################################################################### … … 38 42 export PJSUA_CFLAGS += $(_CFLAGS) 39 43 export PJSUA_CXXFLAGS += $(_CXXFLAGS) 40 export PJSUA_LDFLAGS += $( APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)41 export PJSUA_EXE:= ../bin/pjsua-$(TARGET_NAME)$(HOST_EXE)44 export PJSUA_LDFLAGS += $(_LDFLAGS) 45 export PJSUA_EXE:=pjsua-$(TARGET_NAME)$(HOST_EXE) 42 46 43 47 … … 50 54 export PJSYSTEST_CFLAGS += $(_CFLAGS) 51 55 export PJSYSTEST_CXXFLAGS += $(_CXXFLAGS) 52 export PJSYSTEST_LDFLAGS += $( APP_LDFLAGS) $(APP_LDLIBS) $(LDFLAGS)53 export PJSYSTEST_EXE:= ../bin/pjsystest-$(TARGET_NAME)$(HOST_EXE)56 export PJSYSTEST_LDFLAGS += $(_LDFLAGS) 57 export PJSYSTEST_EXE:=pjsystest-$(TARGET_NAME)$(HOST_EXE) 54 58 55 59 … … 59 63 # 60 64 # 61 TARGETS := pjsua pjsystestsamples65 TARGETS := $(BINDIR)/$(PJSUA_EXE) $(BINDIR)/$(PJSYSTEST_EXE) samples 62 66 63 67 all: $(TARGETS) … … 68 72 distclean: realclean 69 73 70 .PHONY: dep depend clean realclean distclean74 .PHONY: all dep depend clean realclean distclean 71 75 .PHONY: $(TARGETS) 72 76 .PHONY: $(PJSUA_EXE) $(PJSYSTEST_EXE) … … 74 78 pjsua: $(PJSUA_EXE) 75 79 $(PJSUA_EXE): 76 $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $( PJSUA_EXE)80 $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 77 81 78 82 pjsystest: $(PJSYSTEST_EXE) 79 83 $(PJSYSTEST_EXE): 80 $(MAKE) -f $(RULES_MAK) APP=PJSYSTEST app=pjsystest $( PJSYSTEST_EXE)84 $(MAKE) -f $(RULES_MAK) APP=PJSYSTEST app=pjsystest $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 81 85 82 86 samples: 83 87 $(MAKE) -f Samples.mak 84 88 85 .PHONY: ../lib/pjsua.ko86 ../lib/pjsua.ko:87 $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $ @89 .PHONY: pjsua.ko 90 pjsua.ko: 91 $(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 88 92 89 93 clean depend realclean: … … 92 96 $(MAKE) -f Samples.mak $@ 93 97 @if test "$@" = "depend"; then \ 94 echo '$( PJSUA_EXE): $(APP_LIB_FILES)' >> .pjsua-$(TARGET_NAME).depend; \95 echo '$( PJSYSTEST_EXE): $(APP_LIB_FILES)' >> .pjsystest-$(TARGET_NAME).depend; \98 echo '$(BINDIR)/$(PJSUA_EXE): $(APP_LIB_FILES)' >> .pjsua-$(TARGET_NAME).depend; \ 99 echo '$(BINDIR)/$(PJSYSTEST_EXE): $(APP_LIB_FILES)' >> .pjsystest-$(TARGET_NAME).depend; \ 96 100 fi 97 101 -
pjproject/trunk/pjsip-apps/build/Samples.mak
r4440 r4656 1 1 include ../../build.mak 2 include ../../version.mak 2 3 include ../../build/common.mak 3 4 5 RULES_MAK := $(PJDIR)/build/rules.mak 4 6 5 7 ############################################################################### … … 17 19 aviplay \ 18 20 aectest \ 19 aviplay \20 21 clidemo \ 21 22 confsample \ … … 46 47 vid_streamutil 47 48 48 EXES := $(foreach file, $(SAMPLES), $( BINDIR)/$(file)$(HOST_EXE))49 EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE)) 49 50 50 all: $(BINDIR) $(OBJDIR)$(EXES)51 .PHONY: $(EXES) 51 52 52 $(BINDIR)/%$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(PJ_LIB_FILES) 53 $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \ 54 $(subst /,$(HOST_PSEP),$<) \ 55 $(_LDFLAGS) 53 all: $(EXES) 56 54 57 $(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c 58 $(CC) $(_CFLAGS) \ 59 $(CC_OUT)$(subst /,$(HOST_PSEP),$@) \ 60 $(subst /,$(HOST_PSEP),$<) 61 62 $(OBJDIR): 63 $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 64 65 $(BINDIR): 66 $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 55 $(EXES): 56 $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS)" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 67 57 68 58 depend: 69 59 70 60 clean: 71 $(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)/*),$(HOST_RMR)) 72 $(subst @@,$(subst /,$(HOST_PSEP),$(OBJDIR)),$(HOST_RMDIR)) 61 $(MAKE) -f $(RULES_MAK) APP=SAMPLE app=sample $@ 73 62 $(subst @@,$(EXES),$(HOST_RM)) 74 rm -rf $(BINDIR)63 $(subst @@,$(BINDIR),$(HOST_RMDIR)) 75 64 76 65 distclean realclean: clean 77 # $(subst @@,$(subst /,$(HOST_PSEP),$(EXES)) $(subst /,$(HOST_PSEP),$(EXES)),$(HOST_RM)) 78 # $(subst @@,$(DEP_FILE),$(HOST_RM)) 66 $(MAKE) -f $(RULES_MAK) APP=SAMPLE app=sample $@ 79 67 -
pjproject/trunk/pjsip/build/Makefile
r4637 r4656 8 8 include $(PJDIR)/build/common.mak 9 9 10 export LIBDIR := ../lib 11 export BINDIR := ../bin 12 10 13 RULES_MAK := $(PJDIR)/build/rules.mak 11 14 12 15 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) 13 16 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) 17 PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT) 14 18 PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) 15 PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) 16 17 export PJSIP_LIB:=../lib/libpjsip-$(TARGET_NAME)$(LIBEXT) 18 export PJSIP_UA_LIB:=../lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT) 19 export PJSIP_SIMPLE_LIB:=../lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT) 20 export PJSUA_LIB_LIB=../lib/libpjsua-$(TARGET_NAME)$(LIBEXT) 21 19 20 export PJSIP_LIB:=libpjsip-$(TARGET_NAME)$(LIBEXT) 21 export PJSIP_UA_LIB:=libpjsip-ua-$(TARGET_NAME)$(LIBEXT) 22 export PJSIP_SIMPLE_LIB:=libpjsip-simple-$(TARGET_NAME)$(LIBEXT) 23 export PJSUA_LIB_LIB:=libpjsua-$(TARGET_NAME)$(LIBEXT) 24 25 ifeq ($(PJ_SHARED_LIBRARIES),) 26 else 27 export PJSIP_SONAME := libpjsip.$(SHLIB_SUFFIX) 28 export PJSIP_SHLIB := $(PJSIP_SONAME).$(PJ_VERSION_MAJOR) 29 export PJSIP_UA_SONAME := libpjsip-ua.$(SHLIB_SUFFIX) 30 export PJSIP_UA_SHLIB := $(PJSIP_UA_SONAME).$(PJ_VERSION_MAJOR) 31 export PJSIP_SIMPLE_SONAME := libpjsip-simple.$(SHLIB_SUFFIX) 32 export PJSIP_SIMPLE_SHLIB := $(PJSIP_SIMPLE_SONAME).$(PJ_VERSION_MAJOR) 33 export PJSUA_LIB_SONAME := libpjsua.$(SHLIB_SUFFIX) 34 export PJSUA_LIB_SHLIB := $(PJSUA_LIB_SONAME).$(PJ_VERSION_MAJOR) 35 endif 22 36 23 37 ############################################################################### … … 32 46 export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ 33 47 $(HOST_CXXFLAGS) $(CXXFLAGS) 48 export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \ 49 $(APP_THIRD_PARTY_EXT) \ 50 $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ 51 $(APP_LDFLAGS) $(LDFLAGS) 34 52 35 53 ############################################################################### … … 50 68 export PJSIP_CFLAGS += $(_CFLAGS) 51 69 export PJSIP_CXXFLAGS += $(_CXXFLAGS) 70 export PJSIP_LDFLAGS += $(PJLIB_UTIL_LDLIB) \ 71 $(PJLIB_LDLIB) \ 72 $(_LDFLAGS) 52 73 53 74 ############################################################################### … … 60 81 export PJSIP_UA_CFLAGS += $(_CFLAGS) 61 82 export PJSIP_UA_CXXFLAGS += $(_CXXFLAGS) 83 export PJSIP_UA_LDFLAGS += $(PJSIP_SIMPLE_LDLIB) \ 84 $(PJSIP_LDLIB) \ 85 $(PJMEDIA_LDLIB) \ 86 $(PJLIB_UTIL_LDLIB) \ 87 $(PJLIB_LDLIB) \ 88 $(_LDFLAGS) 62 89 63 90 … … 72 99 export PJSIP_SIMPLE_CFLAGS += $(_CFLAGS) 73 100 export PJSIP_SIMPLE_CXXFLAGS += $(_CXXFLAGS) 101 export PJSIP_SIMPLE_LDFLAGS += $(PJSIP_LDLIB) \ 102 $(PJLIB_UTIL_LDLIB) \ 103 $(PJLIB_LDLIB) \ 104 $(_LDFLAGS) 74 105 75 106 … … 84 115 export PJSUA_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) 85 116 export PJSUA_LIB_CXXFLAGS += $(_CXXFLAGS) $(PJ_VIDEO_CFLAGS) 117 export PJSUA_LIB_LDFLAGS += $(PJSIP_UA_LDLIB) \ 118 $(PJSIP_SIMPLE_LDLIB) \ 119 $(PJSIP_LDLIB) \ 120 $(PJMEDIA_AUDIODEV_LDLIB) \ 121 $(PJMEDIA_VIDEODEV_LDLIB) \ 122 $(PJMEDIA_CODEC_LDLIB) \ 123 $(PJMEDIA_LDLIB) \ 124 $(PJNATH_LDLIB) \ 125 $(PJLIB_UTIL_LDLIB) \ 126 $(PJLIB_LDLIB) \ 127 $(_LDFLAGS) 86 128 87 129 … … 101 143 export TEST_CFLAGS += $(_CFLAGS) 102 144 export TEST_CXXFLAGS += $(_CXXFLAGS) 103 export TEST_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) 104 export TEST_EXE := ../bin/pjsip-test-$(TARGET_NAME)$(HOST_EXE) 145 export TEST_LDFLAGS += $(PJSIP_LDLIB) \ 146 $(PJSIP_UA_LDLIB) \ 147 $(PJSIP_SIMPLE_LDLIB) \ 148 $(PJSUA_LDLIB) \ 149 $(PJMEDIA_CODEC_LDLIB) \ 150 $(PJMEDIA_VIDEODEV_LDLIB) \ 151 $(PJMEDIA_LDLIB) \ 152 $(PJMEDIA_AUDIODEV_LDLIB) \ 153 $(PJLIB_LDLIB) \ 154 $(PJLIB_UTIL_LDLIB) \ 155 $(PJNATH_LDLIB) \ 156 $(_LDFLAGS) 157 export TEST_EXE := pjsip-test-$(TARGET_NAME)$(HOST_EXE) 105 158 106 159 … … 110 163 # 111 164 # 112 TARGETS := pjsip pjsip-ua pjsip-simple pjsua-lib pjsip-test 165 TARGETS := $(PJSIP_LIB) $(PJSIP_SONAME) \ 166 $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) \ 167 $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) \ 168 $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) \ 169 $(TEST_EXE) 113 170 114 171 all: $(TARGETS) … … 128 185 distclean: realclean 129 186 130 .PHONY: dep depend clean realclean distclean187 .PHONY: all dep depend clean realclean distclean 131 188 .PHONY: $(TARGETS) 132 .PHONY: $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) $(PJSUA_LIB_LIB) $(TEST_EXE) 189 .PHONY: $(PJSIP_LIB) $(PJSIP_SONAME) 190 .PHONY: $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) 191 .PHONY: $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) 192 .PHONY: $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) 193 .PHONY: $(TEST_EXE) 133 194 134 195 pjsip: $(PJSIP_LIB) 135 $(PJSIP_LIB): 136 $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $(PJSIP_LIB) 196 $(PJSIP_SONAME): $(PJSIP_LIB) 197 $(PJSIP_LIB) $(PJSIP_SONAME): 198 $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 137 199 138 200 pjsip-ua: $(PJSIP_UA_LIB) 139 $(PJSIP_UA_LIB): 140 $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $(PJSIP_UA_LIB) 201 $(PJSIP_UA_SONAME): $(PJSIP_UA_LIB) 202 $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) 203 $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 141 204 142 205 pjsip-simple: $(PJSIP_SIMPLE_LIB) 143 $(PJSIP_SIMPLE_LIB): 144 $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $(PJSIP_SIMPLE_LIB) 206 $(PJSIP_SIMPLE_SONAME): $(PJSIP_SIMPLE_LIB) 207 $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) 208 $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 145 209 146 210 pjsua-lib: $(PJSUA_LIB_LIB) 147 $(PJSUA_LIB_LIB): 148 $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(PJSUA_LIB_LIB) 211 $(PJSUA_LIB_SONAME): $(PJSUA_LIB_LIB) 212 $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) 213 $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 149 214 150 215 pjsip-test: $(TEST_EXE) 151 $(TEST_EXE): $(PJSUA_LIB_LIB) $(PJSIP_SIMPLE_LIB) $(PJSIP_UA_LIB) $(PJSIP_LIB) 152 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(TEST_EXE) 153 154 .PHONY: ../lib/pjsip.ko 155 ../lib/pjsip.ko: 156 echo Making $@ 157 $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $@ 158 159 .PHONY: ../lib/pjsip-ua.ko 160 ../lib/pjsip-ua.ko: 161 echo Making $@ 162 $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@ 163 164 .PHONY: ../lib/pjsip-simple.ko 165 ../lib/pjsip-simple.ko: 166 echo Making $@ 167 $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@ 168 169 .PHONY: ../lib/pjsua-lib.ko 170 ../lib/pjsua-lib.ko: 171 echo Making $@ 172 $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ 216 $(TEST_EXE): $(PJSIP_LIB) $(PJSIP_SONAME) 217 $(TEST_EXE): $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) 218 $(TEST_EXE): $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) 219 $(TEST_EXE): $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) 220 $(TEST_EXE): 221 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(subst /,$(HOST_PSEP),$(BINDIR)/$@) 222 223 .PHONY: pjsip.ko 224 pjsip.ko: 225 echo Making $@ 226 $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 227 228 .PHONY: pjsip-ua.ko 229 pjsip-ua.ko: 230 echo Making $@ 231 $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 232 233 .PHONY: pjsip-simple.ko 234 pjsip-simple.ko: 235 echo Making $@ 236 $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 237 238 .PHONY: pjsua-lib.ko 239 pjsua-lib.ko: 240 echo Making $@ 241 $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 173 242 174 243 clean: … … 185 254 $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ 186 255 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@ 187 echo '$( TEST_EXE): $(PJMEDIA_LIB) $(PJSUA_LIB_LIB) $(PJSIP_SIMPLE_LIB) $(PJSIP_UA_LIB)$(PJSIP_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjsip-test-$(TARGET_NAME).depend256 echo '$(BINDIR)/$(TEST_EXE): $(PJMEDIA_LIB) $(LIBDIR)/$(PJSUA_LIB_LIB) $(LIBDIR)/$(PJSIP_SIMPLE_LIB) $(LIBDIR)/$(PJSIP_UA_LIB) $(LIBDIR)/$(PJSIP_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjsip-test-$(TARGET_NAME).depend 188 257 189 258 realclean: -
pjproject/trunk/third_party/build/g7221/Makefile
r2623 r4656 6 6 RULES_MAK := $(PJDIR)/build/rules.mak 7 7 8 export G7221_CODEC_LIB := ../../lib/libg7221codec-$(TARGET_NAME)$(LIBEXT) 8 export G7221_CODEC_LIB := libg7221codec-$(TARGET_NAME)$(LIBEXT) 9 10 ifeq ($(PJ_SHARED_LIBRARIES),) 11 else 12 export G7221_CODEC_SONAME := libg7221codec.$(SHLIB_SUFFIX) 13 export G7221_CODEC_SHLIB := $(G7221_CODEC_SONAME).$(PJ_VERSION_MAJOR) 14 endif 9 15 10 16 ############################################################################### … … 35 41 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 36 42 # 37 TARGETS := libg7221codec43 TARGETS := $(G7221_CODEC_LIB) $(G7221_CODEC_SONAME) 38 44 39 45 all: $(TARGETS) … … 45 51 distclean: realclean 46 52 47 .PHONY: dep depend libg7221codec clean realclean distclean 53 .PHONY: all dep depend clean realclean distclean 54 .PHONY: $(TARGETS) 55 .PHONY: $(G7221_CODEC_LIB) $(G7221_CODEC_SONAME) 48 56 49 libg7221codec: 50 $(MAKE) -f $(RULES_MAK) APP=G7221_CODEC app=libg7221codec $(G7221_CODEC_LIB) 57 libg7221codec: $(G7221_CODEC_LIB) 58 $(G7221_CODEC_SONAME): $(G7221_CODEC_LIB) 59 $(G7221_CODEC_LIB) $(G7221_CODEC_SONAME): 60 $(MAKE) -f $(RULES_MAK) APP=G7221_CODEC app=libg7221codec $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 51 61 52 62 clean print_lib: -
pjproject/trunk/third_party/build/gsm/Makefile
r2183 r4656 6 6 RULES_MAK := $(PJDIR)/build/rules.mak 7 7 8 export GSM_CODEC_LIB := ../../lib/libgsmcodec-$(TARGET_NAME)$(LIBEXT) 8 export GSM_CODEC_LIB := libgsmcodec-$(TARGET_NAME)$(LIBEXT) 9 10 ifeq ($(PJ_SHARED_LIBRARIES),) 11 else 12 export GSM_CODEC_SONAME := libgsmcodec.$(SHLIB_SUFFIX) 13 export GSM_CODEC_SHLIB := $(GSM_CODEC_SONAME).$(PJ_VERSION_MAJOR) 14 endif 9 15 10 16 ############################################################################### … … 36 42 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 37 43 # 38 TARGETS := libgsmcodec44 TARGETS := $(GSM_CODEC_LIB) $(GSM_CODEC_SONAME) 39 45 40 46 all: $(TARGETS) … … 46 52 distclean: realclean 47 53 48 .PHONY: dep depend libgsmcodec clean realclean distclean 54 .PHONY: all dep depend clean realclean distclean 55 .PHONY: $(TARGETS) 56 .PHONE: $(GSM_CODEC_LIB) $(GSM_CODEC_SONAME) 49 57 50 libgsmcodec: 51 $(MAKE) -f $(RULES_MAK) APP=GSM_CODEC app=libgsmcodec $(GSM_CODEC_LIB) 58 libgsmcodec: $(GSM_CODEC_LIB) 59 $(GSM_CODEC_SONAME): $(GSM_CODEC_LIB) 60 $(GSM_CODEC_LIB) $(GSM_CODEC_SONAME): 61 $(MAKE) -f $(RULES_MAK) APP=GSM_CODEC app=libgsmcodec $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 52 62 53 63 clean print_lib: -
pjproject/trunk/third_party/build/ilbc/Makefile
r2183 r4656 6 6 RULES_MAK := $(PJDIR)/build/rules.mak 7 7 8 export ILBC_LIB := ../../lib/libilbccodec-$(TARGET_NAME)$(LIBEXT) 8 export ILBC_LIB := libilbccodec-$(TARGET_NAME)$(LIBEXT) 9 10 ifeq ($(PJ_SHARED_LIBRARIES),) 11 else 12 export ILBC_SONAME := libilbccodec.$(SHLIB_SUFFIX) 13 export ILBC_SHLIB := $(ILBC_SONAME).$(PJ_VERSION_MAJOR) 14 endif 9 15 10 16 ############################################################################### … … 37 43 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 38 44 # 39 TARGETS := libilbccodec45 TARGETS := $(ILBC_LIB) $(ILBC_SONAME) 40 46 41 47 all: $(TARGETS) … … 47 53 distclean: realclean 48 54 49 .PHONY: dep depend libilbccodec clean realclean distclean 55 .PHONY: all dep depend clean realclean distclean 56 .PHONY: $(TARGETS) 57 .PHONY: $(ILBC_LIB) $(ILBC_SONAME) 50 58 51 libilbccodec: 52 $(MAKE) -f $(RULES_MAK) APP=ILBC app=libilbccodec $(ILBC_LIB) 59 libilbccodec: $(ILBC_LIB) 60 $(ILBC_SONAME): $(ILBC_LIB) 61 $(ILBC_LIB) $(ILBC_SONAME): 62 $(MAKE) -f $(RULES_MAK) APP=ILBC app=libilbccodec $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 53 63 54 64 clean print_lib: -
pjproject/trunk/third_party/build/milenage/Makefile
r2183 r4656 6 6 RULES_MAK := $(PJDIR)/build/rules.mak 7 7 8 export MILENAGE_LIB := ../../lib/libmilenage-$(TARGET_NAME)$(LIBEXT) 8 export MILENAGE_LIB := libmilenage-$(TARGET_NAME)$(LIBEXT) 9 10 ifeq ($(PJ_SHARED_LIBRARIES),) 11 else 12 export MILENAGE_SONAME := libmilenage.$(SHLIB_SUFFIX) 13 export MILENAGE_SHLIB := $(MILENAGE_SONAME).$(PJ_VERSION_MAJOR) 14 endif 9 15 10 16 ############################################################################### … … 30 36 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 31 37 # 32 TARGETS := libmilenage38 TARGETS := $(MILENAGE_LIB) $(MILENAGE_SONAME) 33 39 34 40 all: $(TARGETS) … … 40 46 distclean: realclean 41 47 42 .PHONY: dep depend libmilenage clean realclean distclean 48 .PHONY: all dep depend clean realclean distclean 49 .PHONY: $(TARGETS) 50 .PHONY: $(MILENAGE_LIB) $(MILENAGE_SONAME) 43 51 44 libmilenage: 45 $(MAKE) -f $(RULES_MAK) APP=MILENAGE app=libmilenage $(MILENAGE_LIB) 52 libmilenage: $(MILENAGE_LIB) 53 $(MILENAGE_SONAME): $(MILENAGE_LIB) 54 $(MILENAGE_LIB) $(MILENAGE_SONAME): 55 $(MAKE) -f $(RULES_MAK) APP=MILENAGE app=libmilenage $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 46 56 47 57 clean print_lib: -
pjproject/trunk/third_party/build/portaudio/Makefile
r2183 r4656 7 7 RULES_MAK := $(PJDIR)/build/rules.mak 8 8 9 export PORTAUDIO_LIB:=../../lib/libportaudio-$(TARGET_NAME)$(LIBEXT) 9 export PORTAUDIO_LIB:=libportaudio-$(TARGET_NAME)$(LIBEXT) 10 11 ifeq ($(PJ_SHARED_LIBRARIES),) 12 else 13 export PORTAUDIO_SONAME := libportaudio.$(SHLIB_SUFFIX) 14 export PORTAUDIO_SHLIB := $(PORTAUDIO_SONAME).$(PJ_VERSION_MAJOR) 15 endif 10 16 11 17 PORTAUDIO_OBJS += pa_allocation.o \ … … 44 50 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 45 51 # 46 TARGETS := libportaudio52 TARGETS := $(PORTAUDIO_LIB) $(PORTAUDIO_SONAME) 47 53 48 54 all: $(TARGETS) … … 51 57 distclean: realclean 52 58 53 .PHONY: dep depend libportaudio clean realclean distclean 59 .PHONY: all dep depend clean realclean distclean 60 .PHONY: $(TARGETS) 61 .PHONY: $(PORTAUDIO_LIB) $(PORTAUDIO_SONAME) 54 62 55 libportaudio: 56 $(MAKE) -f $(RULES_MAK) APP=PORTAUDIO app=libportaudio $(PORTAUDIO_LIB) 63 libportaudio: $(PORTAUDIO_LIB) 64 $(PORTAUDIO_SONAME): $(PORTAUDIO_LIB) 65 $(PORTAUDIO_LIB) $(PORTAUDIO_SONAME): 66 $(MAKE) -f $(RULES_MAK) APP=PORTAUDIO app=libportaudio $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 57 67 58 68 clean: -
pjproject/trunk/third_party/build/resample/Makefile
r3999 r4656 22 22 export RESAMPLE_CFLAGS = $(_CFLAGS) 23 23 24 SHLIB_NAME := libresample.$(SHLIB_SUFFIX) 25 export RESAMPLE_SHLIB := ../../lib/$(SHLIB_NAME).$(PJ_VERSION_MAJOR) 26 export RESAMPLE_LIB := ../../lib/libresample-$(TARGET_NAME)$(LIBEXT) 24 export RESAMPLE_LIB := libresample-$(TARGET_NAME)$(LIBEXT) 25 26 ifeq ($(PJ_SHARED_LIBRARIES),) 27 else 28 export RESAMPLE_SONAME := libresample.$(SHLIB_SUFFIX) 29 export RESAMPLE_SHLIB := $(RESAMPLE_SONAME).$(PJ_VERSION_MAJOR) 30 endif 27 31 28 32 export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT … … 32 36 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 33 37 # 34 ifeq ($(PJ_RESAMPLE_DLL),1) 35 TARGETS := ../../lib/$(SHLIB_NAME) 36 ifeq ($(SHLIB_SUFFIX),so) 37 SHLIB_OPT := -Wl,-soname,$(SHLIB_NAME).$(PJ_VERSION_MAJOR) 38 TARGETS := $(RESAMPLE_LIB) $(RESAMPLE_SONAME) 39 ifneq ($(PJ_SHARED_LIBRARIES),) 38 40 else 39 SHLIB_OPT := 41 ifneq ($(PJ_RESAMPLE_DLL),) 42 export RESAMPLE_CFLAGS := -fPIC $(RESAMPLE_CFLAGS) 40 43 endif 41 export RESAMPLE_CFLAGS := -fPIC $(RESAMPLE_CFLAGS)42 export RESAMPLE_LDFLAGS := -shared $(SHLIB_OPT) $(RESAMPLE_LDFLAGS)43 else44 TARGETS := libresample45 44 endif 46 45 … … 53 52 distclean: realclean 54 53 55 .PHONY: dep depend libresample clean realclean distclean 54 .PHONY: all dep depend clean realclean distclean 55 .PHONY: $(TARGETS) 56 .PHONY: $(RESAMPLE_LIB) $(RESAMPLE_SONAME) 56 57 57 libresample: 58 $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $(RESAMPLE_LIB) 58 dep: depend 59 59 60 ../../lib/$(SHLIB_NAME): $(RESAMPLE_SHLIB) 61 ln -s $(SHLIB_NAME).$(PJ_VERSION_MAJOR) $@ 60 libresample: $(RESAMPLE_LIB) 61 $(RESAMPLE_SONAME): $(RESAMPLE_LIB) 62 $(RESAMPLE_LIB) $(RESAMPLE_SONAME): 63 $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 62 64 63 $(RESAMPLE_SHLIB):64 $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $(RESAMPLE_SHLIB)65 66 65 clean print_lib: 67 66 $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $@ 68 67 69 68 realclean: 70 $(subst @@,$(subst /,$(HOST_PSEP),../../lib/$(SHLIB_NAME)),$(HOST_RMR))71 $(subst @@,$(subst /,$(HOST_PSEP),$(RESAMPLE_SHLIB)),$(HOST_RMR))72 69 $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $@ 73 70 -
pjproject/trunk/third_party/build/speex/Makefile
r2183 r4656 6 6 RULES_MAK := $(PJDIR)/build/rules.mak 7 7 8 export SPEEX_LIB := ../../lib/libspeex-$(TARGET_NAME)$(LIBEXT) 8 export SPEEX_LIB := libspeex-$(TARGET_NAME)$(LIBEXT) 9 10 ifeq ($(PJ_SHARED_LIBRARIES),) 11 else 12 export SPEEX_SONAME := libspeex.$(SHLIB_SUFFIX) 13 export SPEEX_SHLIB := $(SPEEX_SONAME).$(PJ_VERSION_MAJOR) 14 endif 9 15 10 16 ############################################################################### … … 45 51 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 46 52 # 47 TARGETS := libspeex53 TARGETS := $(SPEEX_LIB) $(SPEEX_SONAME) 48 54 49 55 all: $(TARGETS) … … 55 61 distclean: realclean 56 62 57 .PHONY: dep depend libspeex clean realclean distclean 63 .PHONY: all dep depend clean realclean distclean 64 .PHONY: $(TARGETS) 65 .PHONY: $(SPEEX_LIB) $(SPEEX_SONAME) 58 66 59 libspeex: 60 $(MAKE) -f $(RULES_MAK) APP=SPEEX app=libspeex $(SPEEX_LIB) 67 libspeex: $(SPEEX_LIB) 68 $(SPEEX_SONAME): $(SPEEX_LIB) 69 $(SPEEX_LIB) $(SPEEX_SONAME): 70 $(MAKE) -f $(RULES_MAK) APP=SPEEX app=libspeex $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 61 71 62 72 clean print_lib: -
pjproject/trunk/third_party/build/srtp/Makefile
r2183 r4656 6 6 RULES_MAK := $(PJDIR)/build/rules.mak 7 7 8 export SRTP_LIB := ../../lib/libsrtp-$(TARGET_NAME)$(LIBEXT) 8 export SRTP_LIB := libsrtp-$(TARGET_NAME)$(LIBEXT) 9 10 ifeq ($(PJ_SHARED_LIBRARIES),) 11 else 12 export SRTP_SONAME := libsrtp.$(SHLIB_SUFFIX) 13 export SRTP_SHLIB := $(SRTP_SONAME).$(PJ_VERSION_MAJOR) 14 endif 9 15 10 16 ############################################################################### … … 58 64 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 59 65 # 60 TARGETS := libsrtp66 TARGETS := $(SRTP_LIB) $(SRTP_SONAME) 61 67 62 68 all: $(TARGETS) … … 68 74 distclean: realclean 69 75 70 .PHONY: dep depend libsrtp clean realclean distclean 76 .PHONY: all dep depend clean realclean distclean 77 .PHONY: $(TARGETS) 78 .PHONY: $(SRTP_LIB) $(SRTP_SONAME) 71 79 72 libsrtp: 73 $(MAKE) -f $(RULES_MAK) APP=SRTP app=libsrtp $(SRTP_LIB) 80 libsrtp: $(SRTP_LIB) 81 $(SRTP_SONAME): $(SRTP_LIB) 82 $(SRTP_LIB) $(SRTP_SONAME): 83 $(MAKE) -f $(RULES_MAK) APP=SRTP app=libsrtp $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 74 84 75 85 clean print_lib:
Note: See TracChangeset
for help on using the changeset viewer.
