Changeset 4781 for pjproject


Ignore:
Timestamp:
Mar 6, 2014 3:33:40 AM (8 years ago)
Author:
ming
Message:

Re #1742 (misc): Add pjsua2 to make install and pkgconfig description and fix its library path

Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/Makefile

    r4769 r4781  
    108108install: 
    109109        mkdir -p $(DESTDIR)$(libdir)/ 
    110         cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/ 
     110#       cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/ 
     111        cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/ 
    111112        mkdir -p $(DESTDIR)$(includedir)/ 
    112113        for d in pjlib pjlib-util pjnath pjmedia pjsip; do \ 
     
    118119                sed -e "s!@LIBDIR@!$(libdir)!" | \ 
    119120                sed -e "s/@PJ_VERSION@/$(PJ_VERSION)/" | \ 
    120                 sed -e "s!@PJ_LDLIBS@!$(PJ_LDLIBS)!" | \ 
    121                 sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc 
     121                sed -e "s!@PJ_LDLIBS@!!" | \ 
     122                sed -e "s!@PJ_LDXXLIBS@!$(PJ_LDXXLIBS)!" | \ 
     123                sed -e "s!@PJ_INSTALL_CFLAGS@!!" | \ 
     124                sed -e "s!@PJ_INSTALL_CXXFLAGS@!$(PJ_INSTALL_CXXFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc 
    122125 
    123126uninstall: 
  • pjproject/trunk/libpjproject.pc.in

    r4656 r4781  
    1010URL: http://www.pjsip.org 
    1111Version: @PJ_VERSION@ 
    12 Libs: -L${libdir} @PJ_LDLIBS@ 
    13 Cflags: -I${includedir} @PJ_INSTALL_CFLAGS@ 
     12Libs: -L${libdir} @PJ_LDXXLIBS@ 
     13Cflags: -I${includedir} @PJ_INSTALL_CXXFLAGS@ 
  • pjproject/trunk/pjsip/build/Makefile

    r4727 r4781  
    2222export PJSIP_SIMPLE_LIB:=libpjsip-simple-$(TARGET_NAME)$(LIBEXT) 
    2323export PJSUA_LIB_LIB:=libpjsua-$(TARGET_NAME)$(LIBEXT) 
    24 export PJSUA2_LIB_LIB=../lib/libpjsua2-$(TARGET_NAME)$(LIBEXT) 
     24export PJSUA2_LIB_LIB=libpjsua2-$(TARGET_NAME)$(LIBEXT) 
    2525 
    2626ifeq ($(PJ_SHARED_LIBRARIES),) 
     
    3434export PJSUA_LIB_SONAME := libpjsua.$(SHLIB_SUFFIX) 
    3535export PJSUA_LIB_SHLIB := $(PJSUA_LIB_SONAME).$(PJ_VERSION_MAJOR) 
    36 export PJSUA2_LIB_SONAME := ../lib/libpjsua2.$(SHLIB_SUFFIX) 
     36export PJSUA2_LIB_SONAME := libpjsua2.$(SHLIB_SUFFIX) 
    3737export PJSUA2_LIB_SHLIB := $(PJSUA2_LIB_SONAME).$(PJ_VERSION_MAJOR) 
    3838endif 
Note: See TracChangeset for help on using the changeset viewer.