Changeset 5761


Ignore:
Timestamp:
Mar 27, 2018 5:35:03 AM (7 years ago)
Author:
riza
Message:

Re #2059 (misc): Don't include test app (exe) when building for Android.

Location:
pjproject/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/build.mak.in

    r5735 r5761  
    2323ifeq (@ac_shared_libraries@,1) 
    2424export PJ_SHARED_LIBRARIES := 1 
     25endif 
     26 
     27ifndef EXCLUDE_APP 
     28ifeq ($(findstring android,$(TARGET_NAME)),) 
     29export EXCLUDE_APP := 0 
     30else 
     31export EXCLUDE_APP := 1 
     32endif 
    2533endif 
    2634 

  • pjproject/trunk/pjlib-util/build/Makefile

    r4727 r5761  
    5555export UTIL_TEST_CXXFLAGS += $(_CXXFLAGS) 
    5656export UTIL_TEST_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) 
     57ifeq ($(EXCLUDE_APP),0) 
    5758export UTIL_TEST_EXE:=pjlib-util-test-$(TARGET_NAME)$(HOST_EXE) 
    58  
     59endif 
    5960         
    6061export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT  

  • pjproject/trunk/pjlib/build/Makefile

    r5725 r5761  
    5757export TEST_CXXFLAGS += $(_CXXFLAGS) 
    5858export TEST_LDFLAGS += $(PJLIB_LDLIB) $(_LDFLAGS) 
     59ifeq ($(EXCLUDE_APP),0) 
    5960export TEST_EXE := pjlib-test-$(TARGET_NAME)$(HOST_EXE) 
    60  
     61endif 
    6162 
    6263export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT  

  • pjproject/trunk/pjmedia/build/Makefile

    r5757 r5761  
    167167                               $(PJLIB_LDLIB) \ 
    168168                               $(_LDFLAGS) 
     169ifeq ($(EXCLUDE_APP),0) 
    169170export PJMEDIA_TEST_EXE:=pjmedia-test-$(TARGET_NAME)$(HOST_EXE) 
    170  
     171endif 
    171172         
    172173export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT  

  • pjproject/trunk/pjnath/build/Makefile

    r4727 r5761  
    5555export PJNATH_TEST_CXXFLAGS += $(_CXXFLAGS) 
    5656export PJNATH_TEST_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) 
     57ifeq ($(EXCLUDE_APP),0) 
    5758export PJNATH_TEST_EXE:=pjnath-test-$(TARGET_NAME)$(HOST_EXE) 
    58  
     59endif 
    5960         
    6061############################################################################### 
    … …  
    6667export PJTURN_CLIENT_CXXFLAGS += $(_CXXFLAGS) 
    6768export PJTURN_CLIENT_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) 
     69ifeq ($(EXCLUDE_APP),0) 
    6870export PJTURN_CLIENT_EXE:=pjturn-client-$(TARGET_NAME)$(HOST_EXE) 
     71endif 
    6972 
    7073############################################################################### 
    … …  
    7780export PJTURN_SRV_CXXFLAGS += $(_CXXFLAGS) 
    7881export PJTURN_SRV_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) 
     82ifeq ($(EXCLUDE_APP),0) 
    7983export PJTURN_SRV_EXE:=pjturn-srv-$(TARGET_NAME)$(HOST_EXE) 
    80  
     84endif 
    8185         
    8286         

  • pjproject/trunk/pjsip-apps/build/Makefile

    r5150 r5761  
    3232export PJSUA_CXXFLAGS += $(PJ_CXXFLAGS) $(CFLAGS) 
    3333export PJSUA_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) 
     34ifeq ($(EXCLUDE_APP),0) 
    3435export PJSUA_EXE:=pjsua-$(TARGET_NAME)$(HOST_EXE) 
    35  
     36endif 
    3637 
    3738############################################################################### 
    … …  
    4445export PJSYSTEST_CXXFLAGS += $(PJ_CXXFLAGS) $(CFLAGS) 
    4546export PJSYSTEST_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) 
     47ifeq ($(EXCLUDE_APP),0) 
    4648export PJSYSTEST_EXE:=pjsystest-$(TARGET_NAME)$(HOST_EXE) 
    47  
     49endif 
    4850 
    4951export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT  

  • pjproject/trunk/pjsip-apps/build/Samples.mak

    r5620 r5761  
    5151PJSUA2_SAMPLES := pjsua2_demo 
    5252 
    53 ifeq ($(findstring android,$(TARGET_NAME)),) 
     53ifeq ($(EXCLUDE_APP),0) 
    5454EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE)) 
    5555PJSUA2_EXES := $(foreach file, $(PJSUA2_SAMPLES), $(file)$(HOST_EXE)) 

  • pjproject/trunk/pjsip/build/Makefile

    r5679 r5761  
    166166export PJSUA2_TEST_CXXFLAGS = $(_CXXFLAGS) $(PJSUA2_LIB_CFLAGS)  
    167167export PJSUA2_TEST_LDFLAGS += $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(LDFLAGS) 
     168ifeq ($(EXCLUDE_APP),0) 
    168169export PJSUA2_TEST_EXE := pjsua2-test-$(TARGET_NAME)$(HOST_EXE) 
    169  
     170endif 
    170171export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT  
    171172 
    … …  
    196197                       $(PJLIB_LDLIB) \ 
    197198                       $(_LDFLAGS) 
     199ifeq ($(EXCLUDE_APP),0) 
    198200export TEST_EXE := pjsip-test-$(TARGET_NAME)$(HOST_EXE) 
    199  
     201endif 
    200202         
    201203export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT  
Note: See TracChangeset for help on using the changeset viewer.