Changeset 4781 for pjproject

Timestamp:

Mar 6, 2014 3:33:40 AM (11 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:

• Makefile (modified) (2 diffs)
• libpjproject.pc.in (modified) (1 diff)
• pjsip/build/Makefile (modified) (2 diffs)

pjproject/trunk/Makefile

@@ -108 +108 @@
 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 \
@@ -118 +119 @@
                 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:

pjproject/trunk/libpjproject.pc.in

@@ -10 +10 @@
 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@

pjproject/trunk/pjsip/build/Makefile

@@ -22 +22 @@
 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),)
@@ -34 +34 @@
 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