Ignore:
Timestamp:
Apr 22, 2007 12:48:30 PM (14 years ago)
Author:
bennylp
Message:

Merged changes from the trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/split-3rd-party/pjnath/build/Makefile

    r1201 r1210  
    1111PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) 
    1212PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT) 
    13 export PJNATH_LIB:=../lib/libpjnath-$(TARGET_NAME)$(LIBEXT) 
    1413 
    1514############################################################################### 
     
    2827 
    2928############################################################################### 
    30 # Defines for building PJLIB-UTIL library 
     29# Defines for building PJNATH library 
    3130# 
    3231export PJNATH_SRCDIR = ../src/pjnath 
     
    4645 
    4746         
     47############################################################################### 
     48# Defines for building test client application 
     49# 
     50export PJSTUN_CLIENT_SRCDIR = ../src/pjstun-client 
     51export PJSTUN_CLIENT_OBJS += client_main.o 
     52export PJSTUN_CLIENT_CFLAGS += $(_CFLAGS) 
     53export PJSTUN_CLIENT_LDFLAGS += $(_LDFLAGS) 
     54export PJSTUN_CLIENT_EXE:=../bin/pjstun-client-$(TARGET_NAME)$(HOST_EXE) 
     55 
     56############################################################################### 
     57# Defines for building test server application 
     58# 
     59export PJSTUN_SRV_TEST_SRCDIR = ../src/pjstun-srv-test 
     60export PJSTUN_SRV_TEST_OBJS +=  bind_usage.o server.o turn_usage.o usage.o \ 
     61                                main.o 
     62export PJSTUN_SRV_TEST_CFLAGS += $(_CFLAGS) 
     63export PJSTUN_SRV_TEST_LDFLAGS += $(_LDFLAGS) 
     64export PJSTUN_SRV_TEST_EXE:=../bin/pjstun-srv-test-$(TARGET_NAME)$(HOST_EXE) 
     65 
     66         
     67         
    4868export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT  
    4969############################################################################### 
     
    5272# $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 
    5373# 
    54 TARGETS := pjnath pjnath-test 
     74TARGETS := pjnath pjnath-test pjstun-client pjstun-srv-test 
    5575 
    5676all: $(TARGETS) 
     
    6989pjnath-test: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) 
    7090        $(MAKE) -f $(RULES_MAK) APP=PJNATH_TEST app=pjnath-test $(PJNATH_TEST_EXE) 
     91 
     92pjstun-client: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) 
     93        $(MAKE) -f $(RULES_MAK) APP=PJSTUN_CLIENT app=pjstun-client $(PJSTUN_CLIENT_EXE) 
     94 
     95pjstun-srv-test: $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) 
     96        $(MAKE) -f $(RULES_MAK) APP=PJSTUN_SRV_TEST app=pjstun-srv-test $(PJSTUN_SRV_TEST_EXE) 
    7197 
    7298.PHONY: ../lib/pjnath.ko 
Note: See TracChangeset for help on using the changeset viewer.