diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-04-22 12:48:30 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-04-22 12:48:30 +0000 |
| commit | 560d8dba3b98b2a5ae65da01b5021757eb366888 (patch) | |
| tree | 2b947a42f03be862b6fa1a45ce1e95723cee0ac1 /pjnath/build | |
| parent | 44d9c946fc77600985b869552887497c2a539d5c (diff) | |
Merged changes from the trunk
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/split-3rd-party@1210 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath/build')
| -rw-r--r-- | pjnath/build/Makefile | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile index 390bfd06..2f265f17 100644 --- a/pjnath/build/Makefile +++ b/pjnath/build/Makefile @@ -10,7 +10,6 @@ RULES_MAK := $(PJDIR)/build/rules.mak PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT) -export PJNATH_LIB:=../lib/libpjnath-$(TARGET_NAME)$(LIBEXT) ############################################################################### # Gather all flags. @@ -27,7 +26,7 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \ $(LDFLAGS) ############################################################################### -# Defines for building PJLIB-UTIL library +# Defines for building PJNATH library # export PJNATH_SRCDIR = ../src/pjnath export PJNATH_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ @@ -45,13 +44,34 @@ export PJNATH_TEST_LDFLAGS += $(_LDFLAGS) export PJNATH_TEST_EXE:=../bin/pjnath-test-$(TARGET_NAME)$(HOST_EXE) +############################################################################### +# Defines for building test client application +# +export PJSTUN_CLIENT_SRCDIR = ../src/pjstun-client +export PJSTUN_CLIENT_OBJS += client_main.o +export PJSTUN_CLIENT_CFLAGS += $(_CFLAGS) +export PJSTUN_CLIENT_LDFLAGS += $(_LDFLAGS) +export PJSTUN_CLIENT_EXE:=../bin/pjstun-client-$(TARGET_NAME)$(HOST_EXE) + +############################################################################### +# Defines for building test server application +# +export PJSTUN_SRV_TEST_SRCDIR = ../src/pjstun-srv-test +export PJSTUN_SRV_TEST_OBJS += bind_usage.o server.o turn_usage.o usage.o \ + main.o +export PJSTUN_SRV_TEST_CFLAGS += $(_CFLAGS) +export PJSTUN_SRV_TEST_LDFLAGS += $(_LDFLAGS) +export PJSTUN_SRV_TEST_EXE:=../bin/pjstun-srv-test-$(TARGET_NAME)$(HOST_EXE) + + + export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT ############################################################################### # Main entry # # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. # -TARGETS := pjnath pjnath-test +TARGETS := pjnath pjnath-test pjstun-client pjstun-srv-test all: $(TARGETS) @@ -69,6 +89,12 @@ pjnath: pjnath-test: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $(PJNATH_TEST_EXE) +pjstun-client: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) + $(MAKE) -f $(RULES_MAK) APP=PJSTUN_CLIENT app=pjstun-client $(PJSTUN_CLIENT_EXE) + +pjstun-srv-test: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) + $(MAKE) -f $(RULES_MAK) APP=PJSTUN_SRV_TEST app=pjstun-srv-test $(PJSTUN_SRV_TEST_EXE) + .PHONY: ../lib/pjnath.ko ../lib/pjnath.ko: echo Making $@ |