diff options
author | Benny Prijono <bennylp@teluu.com> | 2008-03-20 19:21:27 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2008-03-20 19:21:27 +0000 |
commit | 619fc98f231881529092bf502d84ccbef0d4db76 (patch) | |
tree | 40364fc2238ce7e31eca91cfa019411c5eff722a /pjnath/build | |
parent | c2af691caa819333a261757e9f02e761203d8592 (diff) |
More ticket #485: updated Makefiles and fixed compilation warnings with gcc
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1882 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath/build')
-rw-r--r-- | pjnath/build/Makefile | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile index 393562f5..9dd0b2db 100644 --- a/pjnath/build/Makefile +++ b/pjnath/build/Makefile @@ -31,7 +31,8 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJNATH_LIB)) \ export PJNATH_SRCDIR = ../src/pjnath export PJNATH_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ errno.o ice_session.o ice_strans.o nat_detect.o stun_auth.o \ - stun_msg.o stun_msg_dump.o stun_session.o stun_transaction.o + stun_msg.o stun_msg_dump.o stun_session.o stun_transaction.o \ + turn_session.o turn_udp.o export PJNATH_CFLAGS += $(_CFLAGS) ############################################################################### @@ -45,23 +46,23 @@ export PJNATH_TEST_EXE:=../bin/pjnath-test-$(TARGET_NAME)$(HOST_EXE) ############################################################################### -# Defines for building test client application +# Defines for building TURN 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) +export PJTURN_CLIENT_SRCDIR = ../src/pjturn-client +export PJTURN_CLIENT_OBJS += client_main.o +export PJTURN_CLIENT_CFLAGS += $(_CFLAGS) +export PJTURN_CLIENT_LDFLAGS += $(_LDFLAGS) +export PJTURN_CLIENT_EXE:=../bin/pjturn-client-$(TARGET_NAME)$(HOST_EXE) ############################################################################### -# Defines for building test server application +# Defines for building TURN 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 \ +export PJTURN_SRV_SRCDIR = ../src/pjturn-srv +export PJTURN_SRV_OBJS += allocation.o auth.o listener_udp.o server.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 PJTURN_SRV_CFLAGS += $(_CFLAGS) +export PJTURN_SRV_LDFLAGS += $(_LDFLAGS) +export PJTURN_SRV_EXE:=../bin/pjturn-srv-$(TARGET_NAME)$(HOST_EXE) @@ -71,8 +72,7 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT # # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. # -TARGETS := pjnath pjnath-test -#pjstun-client pjstun-srv-test +TARGETS := pjnath pjnath-test pjturn-client pjturn-srv all: $(TARGETS) @@ -90,11 +90,11 @@ 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) +pjturn-client: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) + $(MAKE) -f $(RULES_MAK) APP=PJTURN_CLIENT app=pjturn-client $(PJTURN_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) +pjturn-srv: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) + $(MAKE) -f $(RULES_MAK) APP=PJTURN_SRV app=pjturn-srv $(PJTURN_SRV_EXE) .PHONY: ../lib/pjnath.ko ../lib/pjnath.ko: @@ -108,24 +108,24 @@ pjstun-srv-test: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) clean: $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $@ $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $@ - $(MAKE) -f $(RULES_MAK) APP=PJSTUN_CLIENT app=pjstun-client $@ - $(MAKE) -f $(RULES_MAK) APP=PJSTUN_SRV_TEST app=pjstun-srv-test $@ + $(MAKE) -f $(RULES_MAK) APP=PJTURN_CLIENT app=pjturn-client $@ + $(MAKE) -f $(RULES_MAK) APP=PJTURN_SRV app=pjturn-srv $@ realclean: $(subst @@,$(subst /,$(HOST_PSEP),.pjnath-$(TARGET_NAME).depend),$(HOST_RMR)) $(subst @@,$(subst /,$(HOST_PSEP),.pjnath-test-$(TARGET_NAME).depend),$(HOST_RMR)) - $(subst @@,$(subst /,$(HOST_PSEP),.pjstun-client-$(TARGET_NAME).depend),$(HOST_RMR)) - $(subst @@,$(subst /,$(HOST_PSEP),.pjstun-srv-test-$(TARGET_NAME).depend),$(HOST_RMR)) + $(subst @@,$(subst /,$(HOST_PSEP),.pjturn-client-$(TARGET_NAME).depend),$(HOST_RMR)) + $(subst @@,$(subst /,$(HOST_PSEP),.pjturn-srv-$(TARGET_NAME).depend),$(HOST_RMR)) $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $@ $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $@ - $(MAKE) -f $(RULES_MAK) APP=PJSTUN_CLIENT app=pjstun-client $@ - $(MAKE) -f $(RULES_MAK) APP=PJSTUN_SRV_TEST app=pjstun-srv-test $@ + $(MAKE) -f $(RULES_MAK) APP=PJTURN_CLIENT app=pjturn-client $@ + $(MAKE) -f $(RULES_MAK) APP=PJTURN_SRV app=pjturn-srv $@ depend: $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $@ $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $@ - $(MAKE) -f $(RULES_MAK) APP=PJSTUN_CLIENT app=pjstun-client $@ - $(MAKE) -f $(RULES_MAK) APP=PJSTUN_SRV_TEST app=pjstun-srv-test $@ + $(MAKE) -f $(RULES_MAK) APP=PJTURN_CLIENT app=pjturn-client $@ + $(MAKE) -f $(RULES_MAK) APP=PJTURN_SRV app=pjturn-srv $@ echo '$(TEST_EXE): $(PJNATH_LIB)' >> .pjnath-test-$(TARGET_NAME).depend; \ |