![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
Changeset 431
- Timestamp:
- May 4, 2006 8:43:02 AM (18 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 7 edited
-
build/rules.mak (modified) (2 diffs)
-
configure (modified) (3 diffs)
-
pjlib-util/build/Makefile (modified) (3 diffs)
-
pjlib/build/Makefile (modified) (3 diffs)
-
pjmedia/build/Makefile (modified) (3 diffs)
-
pjsip-apps/build/Makefile (modified) (4 diffs)
-
pjsip/build/Makefile (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/build/rules.mak
r355 r431 20 20 # Output directory for object files (i.e. output/target) 21 21 # 22 OBJDIR = output/$(app)-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)22 OBJDIR = output/$(app)-$(TARGET_NAME) 23 23 24 24 ifeq ($(OS_NAME),linux-kernel) … … 45 45 46 46 # Dependency file 47 DEP_FILE := .$(app)-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend47 DEP_FILE := .$(app)-$(TARGET_NAME).depend 48 48 49 49 -
pjproject/trunk/configure
r369 r431 69 69 fi 70 70 71 # 72 # TARGET 73 # 74 TARGET_NAME=$MACHINE_NAME-$OS_NAME-$CC_NAME 75 76 71 77 if test -f build.mak; then 72 78 echo 'Saving build.mak --> build.mak.old' … … 79 85 echo " HOST_NAME = $HOST_NAME" 80 86 echo " CC_NAME = $CC_NAME" 87 echo " TARGET_NAME = $TARGET_NAME" 81 88 echo " LINUX_POLL = $LINUX_POLL" 82 89 … … 86 93 echo "export HOST_NAME := $HOST_NAME" >> build.mak 87 94 echo "export CC_NAME := $CC_NAME" >> build.mak 95 echo "export TARGET_NAME := $TARGET_NAME" >> build.mak 88 96 echo "export LINUX_POLL := $LINUX_POLL" >> build.mak 89 97 -
pjproject/trunk/pjlib-util/build/Makefile
r359 r431 3 3 RULES_MAK := ../../build/rules.mak 4 4 5 PJLIB_LIB:=../../pjlib/lib/libpj-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)6 export PJLIB_UTIL_LIB:=../lib/libpjlib-util-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)5 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) 6 export PJLIB_UTIL_LIB:=../lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) 7 7 8 8 ############################################################################### … … 34 34 export UTIL_TEST_CFLAGS += $(_CFLAGS) 35 35 export UTIL_TEST_LDFLAGS += $(_LDFLAGS) 36 export UTIL_TEST_EXE:=../bin/pjlib-util-test-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE)36 export UTIL_TEST_EXE:=../bin/pjlib-util-test-$(TARGET_NAME)$(HOST_EXE) 37 37 38 38 … … 74 74 $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $@ 75 75 @if test "$@" = "depend"; then \ 76 echo '$(TEST_EXE): $(PJLIB_UTIL_LIB)' >> .pjlib-util-test-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \76 echo '$(TEST_EXE): $(PJLIB_UTIL_LIB)' >> .pjlib-util-test-$(TARGET_NAME).depend; \ 77 77 fi 78 78 -
pjproject/trunk/pjlib/build/Makefile
r365 r431 4 4 5 5 6 export PJLIB_LIB := ../lib/libpj-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)6 export PJLIB_LIB := ../lib/libpj-$(TARGET_NAME)$(LIBEXT) 7 7 8 8 ############################################################################### … … 43 43 export TEST_CFLAGS += $(_CFLAGS) 44 44 export TEST_LDFLAGS += $(_LDFLAGS) 45 export TEST_EXE := ../bin/pjlib-test-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE)45 export TEST_EXE := ../bin/pjlib-test-$(TARGET_NAME)$(HOST_EXE) 46 46 47 47 … … 65 65 $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib depend 66 66 $(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test depend 67 echo '$(TEST_EXE): $(PJLIB_LIB)' >> .pjlib-test-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend67 echo '$(TEST_EXE): $(PJLIB_LIB)' >> .pjlib-test-$(TARGET_NAME).depend 68 68 69 69 -
pjproject/trunk/pjmedia/build/Makefile
r417 r431 19 19 RULES_MAK := ../../build/rules.mak 20 20 21 PJLIB_LIB:=../../pjlib/lib/libpj-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)22 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)21 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) 22 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) 23 23 24 export PJMEDIA_LIB:=../lib/libpjmedia-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)25 export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)24 export PJMEDIA_LIB:=../lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) 25 export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) 26 26 27 27 ############################################################################### … … 118 118 export PJMEDIA_TEST_CFLAGS += $(_CFLAGS) 119 119 export PJMEDIA_TEST_LDFLAGS += $(_LDFLAGS) 120 export PJMEDIA_TEST_EXE:=../bin/pjmedia-test-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE)120 export PJMEDIA_TEST_EXE:=../bin/pjmedia-test-$(TARGET_NAME)$(HOST_EXE) 121 121 122 122 … … 169 169 $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_CODEC app=pjmedia-codec $@ 170 170 @if test "$@" = "depend"; then \ 171 echo '$(PJMEDIA_LIB): .pjmedia-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend' >> .pjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \172 echo '$(PJMEDIA_CODEC_LIB): .pjmedia-codec-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend' >> .pjmedia-codec-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \173 echo '$(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjmedia-test-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \171 echo '$(PJMEDIA_LIB): .pjmedia-$(TARGET_NAME).depend' >> .pjmedia-$(TARGET_NAME).depend; \ 172 echo '$(PJMEDIA_CODEC_LIB): .pjmedia-codec-$(TARGET_NAME).depend' >> .pjmedia-codec-$(TARGET_NAME).depend; \ 173 echo '$(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjmedia-test-$(TARGET_NAME).depend; \ 174 174 fi 175 175 -
pjproject/trunk/pjsip-apps/build/Makefile
r355 r431 3 3 RULES_MAK := ../../build/rules.mak 4 4 5 PJLIB_LIB:=../../pjlib/lib/libpj-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)6 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)7 PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)8 PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)9 PJSIP_LIB:=../../pjsip/lib/libpjsip-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)10 PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)11 PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)12 PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)5 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) 6 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) 7 PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) 8 PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) 9 PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT) 10 PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT) 11 PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT) 12 PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT) 13 13 14 14 … … 41 41 export PJSUA_CFLAGS += $(_CFLAGS) 42 42 export PJSUA_LDFLAGS += $(_LDFLAGS) 43 export PJSUA_EXE:=../bin/pjsua-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE)43 export PJSUA_EXE:=../bin/pjsua-$(TARGET_NAME)$(HOST_EXE) 44 44 45 45 … … 53 53 export PJSIPPERF_CFLAGS += $(_CFLAGS) 54 54 export PJSIPPERF_LDFLAGS += $(_LDFLAGS) 55 export PJSIPPERF_EXE:=../bin/pjsip-perf-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE)55 export PJSIPPERF_EXE:=../bin/pjsip-perf-$(TARGET_NAME)$(HOST_EXE) 56 56 57 57 … … 94 94 $(MAKE) -f Samples.mak $@ 95 95 @if test "$@" = "depend"; then \ 96 echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) Makefile' >> .pjsua-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \97 echo '$(PJSIPPERF_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjsip-perf-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).depend; \96 echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) Makefile' >> .pjsua-$(TARGET_NAME).depend; \ 97 echo '$(PJSIPPERF_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjsip-perf-$(TARGET_NAME).depend; \ 98 98 fi 99 99 -
pjproject/trunk/pjsip/build/Makefile
r360 r431 3 3 RULES_MAK := ../../build/rules.mak 4 4 5 PJLIB_LIB:=../../pjlib/lib/libpj-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)6 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)7 PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)8 PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)5 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) 6 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) 7 PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) 8 PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) 9 9 10 export PJSIP_LIB:=../lib/libpjsip-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)11 export PJSIP_UA_LIB:=../lib/libpjsip-ua-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)12 export PJSIP_SIMPLE_LIB:=../lib/libpjsip-simple-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)13 export PJSUA_LIB_LIB=../lib/libpjsua-$( MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(LIBEXT)10 export PJSIP_LIB:=../lib/libpjsip-$(TARGET_NAME)$(LIBEXT) 11 export PJSIP_UA_LIB:=../lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT) 12 export PJSIP_SIMPLE_LIB:=../lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT) 13 export PJSUA_LIB_LIB=../lib/libpjsua-$(TARGET_NAME)$(LIBEXT) 14 14 15 15
Note: See TracChangeset
for help on using the changeset viewer.
