Commit d5b0ffea authored by Emmanuel Milou's avatar Emmanuel Milou

Remove pjproject version number

parent be8b80d3

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -426,6 +426,6 @@ AC_SUBST(DBUS_SERVICES_DIR)
AC_SUBST(SFLPHONE_CFLAGS)
AC_SUBST(SFLPHONE_LIBS)
AC_OUTPUT
AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-1.4) has already been compiled. Run `make' to build the software.]])
AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject) has already been compiled. Run `make' to build the software.]])
......@@ -6,15 +6,13 @@ sflplugindir=$(DESTDIR)$(libdir)/sflphone/plugins
ASTYLERC="../astylerc"
indent="/usr/bin/astyle"
PJSIP_VERSION="1.4"
# for pjsip
PJSIP_LIBS= \
-L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjnath/lib/ \
-L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjsip/lib/ \
-L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib/lib/ \
-L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib-util/lib/ \
-L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjmedia/lib/ \
-L$(src)/libs/pjproject/pjnath/lib/ \
-L$(src)/libs/pjproject/pjsip/lib/ \
-L$(src)/libs/pjproject/pjlib/lib/ \
-L$(src)/libs/pjproject/pjlib-util/lib/ \
-L$(src)/libs/pjproject/pjmedia/lib/ \
-lpjnath-sfl-$(target) \
-lpjsua-sfl-$(target) \
-lpjsip-sfl-$(target) \
......@@ -25,11 +23,11 @@ PJSIP_LIBS= \
-lpjlib-util-sfl-$(target) \
-lpj-sfl-$(target)
SIP_CFLAGS=-I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjsip/include \
-I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib/include \
-I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib-util/include \
-I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjmedia/include \
-I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjnath/include
SIP_CFLAGS=-I$(src)/libs/pjproject/pjsip/include \
-I$(src)/libs/pjproject/pjlib/include \
-I$(src)/libs/pjproject/pjlib-util/include \
-I$(src)/libs/pjproject/pjmedia/include \
-I$(src)/libs/pjproject/pjnath/include
DBUSCPP_CFLAGS=$(top_srcdir)/libs/dbus-c++/include/dbus-c++
......@@ -50,7 +48,7 @@ AM_CPPFLAGS = \
-I$(src)/libs \
-I$(src)/libs/dbus-c++/include \
-I$(src)/libs/iax2 \
-I$(src)/libs/pjproject-$(PJSIP_VERSION) \
-I$(src)/libs/pjproject \
-I$(src)/src \
-I$(src)/src/config \
-I$(src)/test \
......
......@@ -21,13 +21,3 @@ Internet Draft for IAX2 protocol
http://tools.ietf.org/id/draft-guy-iax-03.txt
Compilation and installation
============================
Run:
-------------------------
./gen.sh
./configure --prefix=/usr
make
-------------------------
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
# build.mak. Generated from build.mak.in by configure.
export MACHINE_NAME := auto
export OS_NAME := auto
export HOST_NAME := unix
export CC_NAME := gcc
export TARGET_NAME := x86_64-unknown-linux-gnu
export CROSS_COMPILE :=
export LINUX_POLL := select
LIB_SUFFIX = $(TARGET_NAME).a
# Determine which party libraries to use
export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME)
export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX)
ifneq (,1)
APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME)
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX)
endif
ifneq (,1)
APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME)
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX)
endif
ifneq (,1)
APP_THIRD_PARTY_LIBS += -lilbccodec-$(TARGET_NAME)
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec-$(LIB_SUFFIX)
endif
ifneq (,1)
APP_THIRD_PARTY_LIBS += -lg7221codec-$(TARGET_NAME)
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec-$(LIB_SUFFIX)
endif
ifneq ($(findstring pa,pa_unix),)
APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME)
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX)
endif
# Additional flags
# CFLAGS, LDFLAGS, and LIBS to be used by applications
export PJDIR := /home/emilou/git-repos/sflphone/sflphone-common/libs/pjproject
export APP_CC := $(CROSS_COMPILE)$(CC_NAME)
export APP_CFLAGS := -DPJ_AUTOCONF=1\
-O2\
-I$(PJDIR)/pjlib/include\
-I$(PJDIR)/pjlib-util/include\
-I$(PJDIR)/pjnath/include\
-I$(PJDIR)/pjmedia/include\
-I$(PJDIR)/pjsip/include
export APP_CXXFLAGS := $(APP_CFLAGS)
export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
-L$(PJDIR)/pjlib-util/lib\
-L$(PJDIR)/pjnath/lib\
-L$(PJDIR)/pjmedia/lib\
-L$(PJDIR)/pjsip/lib\
-L$(PJDIR)/third_party/lib\
export APP_LDLIBS := -lpjsua-sfl-$(TARGET_NAME)\
-lpjsip-ua-sfl-$(TARGET_NAME)\
-lpjsip-simple-sfl-$(TARGET_NAME)\
-lpjsip-sfl-$(TARGET_NAME)\
-lpjmedia-codec-sfl-$(TARGET_NAME)\
-lpjmedia-sfl-$(TARGET_NAME)\
-lpjmedia-audiodev-sfl-$(TARGET_NAME)\
-lpjnath-sfl-$(TARGET_NAME)\
-lpjlib-util-sfl-$(TARGET_NAME)\
$(APP_THIRD_PARTY_LIBS)\
-lpj-sfl-$(TARGET_NAME)\
-lm -luuid -lnsl -lrt -lpthread -lasound -lssl -lcrypto
export APP_LIB_FILES = $(PJ_DIR)/pjsip/lib/libpjsua-sfl-$(LIB_SUFFIX) \
$(PJ_DIR)/pjsip/lib/libpjsip-ua-sfl-$(LIB_SUFFIX) \
$(PJ_DIR)/pjsip/lib/libpjsip-simple-sfl-$(LIB_SUFFIX) \
$(PJ_DIR)/pjsip/lib/libpjsip-sfl-$(LIB_SUFFIX) \
$(PJ_DIR)/pjmedia/lib/libpjmedia-codec-sfl-$(LIB_SUFFIX) \
$(PJ_DIR)/pjmedia/lib/libpjmedia-sfl-$(LIB_SUFFIX) \
$(PJ_DIR)/pjmedia/lib/libpjmedia-audiodev-sfl-$(LIB_SUFFIX) \
$(PJ_DIR)/pjnath/lib/libpjnath-sfl-$(LIB_SUFFIX) \
$(PJ_DIR)/pjlib-util/lib/libpjlib-util-sfl-$(LIB_SUFFIX) \
$(APP_THIRD_PARTY_LIB_FILES) \
$(PJ_DIR)/pjlib/lib/libpj-sfl-$(LIB_SUFFIX)
export PJ_DIR := $(PJDIR)
export PJ_CC := $(APP_CC)
export PJ_CFLAGS := $(APP_CFLAGS)
export PJ_CXXFLAGS := $(APP_CXXFLAGS)
export PJ_LDFLAGS := $(APP_LDFLAGS)
export PJ_LDLIBS := $(APP_LDLIBS)
export PJ_LIB_FILES := $(APP_LIB_FILES)