diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2014-03-06 03:33:40 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2014-03-06 03:33:40 +0000 |
| commit | 118a33df9af8b9e41a026e1a2bc41adac8af2dba (patch) | |
| tree | ecbb30ac66f3f6fb48322950712c9e46c4caf85a | |
| parent | 4984e13186aed5849fcb46b003b5cb0eadf25dbb (diff) | |
Re #1742 (misc): Add pjsua2 to make install and pkgconfig description and fix its library path
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4781 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | libpjproject.pc.in | 4 | ||||
| -rw-r--r-- | pjsip/build/Makefile | 4 |
3 files changed, 10 insertions, 7 deletions
@@ -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 diff --git a/libpjproject.pc.in b/libpjproject.pc.in index fb7c8b17..fa8d3911 100644 --- a/libpjproject.pc.in +++ b/libpjproject.pc.in @@ -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@ diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index 37dca79d..a88e598e 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -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 |