Re #1742 (misc): Add pjsua2 to make install and pkgconfig description and fix its library path
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@4781 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
parent
0adad1010c
commit
72cc418a97
9
Makefile
9
Makefile
|
@ -107,7 +107,8 @@ pjsua-test:
|
|||
|
||||
install:
|
||||
mkdir -p $(DESTDIR)$(libdir)/
|
||||
cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/
|
||||
# cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/
|
||||
cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/
|
||||
mkdir -p $(DESTDIR)$(includedir)/
|
||||
for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
|
||||
cp -RLf $$d/include/* $(DESTDIR)$(includedir)/; \
|
||||
|
@ -117,8 +118,10 @@ install:
|
|||
sed -e "s!@INCLUDEDIR@!$(includedir)!" | \
|
||||
sed -e "s!@LIBDIR@!$(libdir)!" | \
|
||||
sed -e "s/@PJ_VERSION@/$(PJ_VERSION)/" | \
|
||||
sed -e "s!@PJ_LDLIBS@!$(PJ_LDLIBS)!" | \
|
||||
sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc
|
||||
sed -e "s!@PJ_LDLIBS@!!" | \
|
||||
sed -e "s!@PJ_LDXXLIBS@!$(PJ_LDXXLIBS)!" | \
|
||||
sed -e "s!@PJ_INSTALL_CFLAGS@!!" | \
|
||||
sed -e "s!@PJ_INSTALL_CXXFLAGS@!$(PJ_INSTALL_CXXFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc
|
||||
|
||||
uninstall:
|
||||
$(RM) $(DESTDIR)$(libdir)/pkgconfig/libpjproject.pc
|
||||
|
|
|
@ -9,5 +9,5 @@ Name: libpjproject
|
|||
Description: Multimedia communication library
|
||||
URL: http://www.pjsip.org
|
||||
Version: @PJ_VERSION@
|
||||
Libs: -L${libdir} @PJ_LDLIBS@
|
||||
Cflags: -I${includedir} @PJ_INSTALL_CFLAGS@
|
||||
Libs: -L${libdir} @PJ_LDXXLIBS@
|
||||
Cflags: -I${includedir} @PJ_INSTALL_CXXFLAGS@
|
||||
|
|
|
@ -21,7 +21,7 @@ export PJSIP_LIB:=libpjsip-$(TARGET_NAME)$(LIBEXT)
|
|||
export PJSIP_UA_LIB:=libpjsip-ua-$(TARGET_NAME)$(LIBEXT)
|
||||
export PJSIP_SIMPLE_LIB:=libpjsip-simple-$(TARGET_NAME)$(LIBEXT)
|
||||
export PJSUA_LIB_LIB:=libpjsua-$(TARGET_NAME)$(LIBEXT)
|
||||
export PJSUA2_LIB_LIB=../lib/libpjsua2-$(TARGET_NAME)$(LIBEXT)
|
||||
export PJSUA2_LIB_LIB=libpjsua2-$(TARGET_NAME)$(LIBEXT)
|
||||
|
||||
ifeq ($(PJ_SHARED_LIBRARIES),)
|
||||
else
|
||||
|
@ -33,7 +33,7 @@ export PJSIP_SIMPLE_SONAME := libpjsip-simple.$(SHLIB_SUFFIX)
|
|||
export PJSIP_SIMPLE_SHLIB := $(PJSIP_SIMPLE_SONAME).$(PJ_VERSION_MAJOR)
|
||||
export PJSUA_LIB_SONAME := libpjsua.$(SHLIB_SUFFIX)
|
||||
export PJSUA_LIB_SHLIB := $(PJSUA_LIB_SONAME).$(PJ_VERSION_MAJOR)
|
||||
export PJSUA2_LIB_SONAME := ../lib/libpjsua2.$(SHLIB_SUFFIX)
|
||||
export PJSUA2_LIB_SONAME := libpjsua2.$(SHLIB_SUFFIX)
|
||||
export PJSUA2_LIB_SHLIB := $(PJSUA2_LIB_SONAME).$(PJ_VERSION_MAJOR)
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue