jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

* #25974: daemon: fix pjproject path

Browse Source
This commit is contained in:
Tristan Matthews
2013-06-19 16:53:14 -04:00
parent 9ee5343bb1
commit eb4391361b
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
daemon/.gitignore vendored
View File

@ -45,15 +45,15 @@ libs/dbus-c++/tools/.libs/
libs/dbus-c++/tools/dbusxx-introspect
libs/dbus-c++/tools/dbusxx-xml2cpp
libs/pjproject-2.0.1/pjlib-util/build/os-auto.mak
libs/pjproject-2.0.1/pjlib/build/os-auto.mak
libs/pjproject-2.0.1/pjlib/include/pj/compat/m_auto.h
libs/pjproject-2.0.1/pjlib/include/pj/compat/os_auto.h
libs/pjproject-2.0.1/pjlib/include/pj/config_site.h
libs/pjproject-2.0.1/pjmedia/build/os-auto.mak
libs/pjproject-2.0.1/pjmedia/include/pjmedia-codec/config_auto.h
libs/pjproject-2.0.1/pjmedia/include/pjmedia/config_auto.h
libs/pjproject-2.0.1/pjsip/build/os-auto.mak
libs/pjproject-2.0.1/pjsip/include/pjsip/sip_autoconf.h
libs/pjproject-2.0.1/third_party/build/os-auto.mak
libs/pjproject-2.0.1/third_party/build/portaudio/os-auto.mak
libs/pjproject-2.1.0/pjlib-util/build/os-auto.mak
libs/pjproject-2.1.0/pjlib/build/os-auto.mak
libs/pjproject-2.1.0/pjlib/include/pj/compat/m_auto.h
libs/pjproject-2.1.0/pjlib/include/pj/compat/os_auto.h
libs/pjproject-2.1.0/pjlib/include/pj/config_site.h
libs/pjproject-2.1.0/pjmedia/build/os-auto.mak
libs/pjproject-2.1.0/pjmedia/include/pjmedia-codec/config_auto.h
libs/pjproject-2.1.0/pjmedia/include/pjmedia/config_auto.h
libs/pjproject-2.1.0/pjsip/build/os-auto.mak
libs/pjproject-2.1.0/pjsip/include/pjsip/sip_autoconf.h
libs/pjproject-2.1.0/third_party/build/os-auto.mak
libs/pjproject-2.1.0/third_party/build/portaudio/os-auto.mak

2
daemon/doc/doxygen/core-doc.cfg.in
View File

@ -640,7 +640,7 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.
EXCLUDE = libs/pjproject-2.0.1
EXCLUDE = libs/pjproject-2.1.0
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded

2
daemon/libs/Makefile.am
View File

@ -2,4 +2,4 @@ if USE_IAX
SUBDIRS = iax2
endif
EXTRA_DIST=pjproject-2.0.1
EXTRA_DIST=pjproject-2.1.0

4
hudson-sflphone-script.sh
View File

@ -111,7 +111,7 @@ function build_daemon {
make distclean
./autogen.sh
# Compile pjproject first
pushd libs/pjproject-2.0.1
pushd libs/pjproject-2.1.0
./autogen.sh
CFLAGS=-fPIC ./configure
make && make dep
@ -134,7 +134,7 @@ function build_gnome {
make distclean
./autogen.sh
# Compile pjproject first
pushd libs/pjproject-2.0.1
pushd libs/pjproject-2.1.0
./autogen.sh
CFLAGS=-fPIC ./configure
make && make dep

2
tools/build-system/build_tarball.sh
View File

@ -48,7 +48,7 @@ pushd daemon
./autogen.sh
popd
pushd daemon/libs/pjproject-2.0.1
pushd daemon/libs/pjproject-2.1.0
find -name os-auto.mak -type f -exec rm {} \;
# Remove pre-built binaries

4
tools/build-system/launchpad/sflphone-common-video/debian/rules
View File

@ -22,7 +22,7 @@ configure-stamp:
# Add here commands to configure the package.
./autogen.sh
./configure --prefix=/usr --enable-video
cd libs/pjproject-2.0.1; CFLAGS=-fPIC ./configure --disable-sound --disable-video
cd libs/pjproject-2.1.0; CFLAGS=-fPIC ./configure --disable-sound --disable-video
touch configure-stamp
#Architecture
@ -32,7 +32,7 @@ build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
# Add here commands to compile the arch part of the package.
cd libs/pjproject-2.0.1; $(MAKE) dep; $(MAKE) clean; $(MAKE)
cd libs/pjproject-2.1.0; $(MAKE) dep; $(MAKE) clean; $(MAKE)
$(MAKE)
touch $@

4
tools/build-system/launchpad/sflphone-common/debian/rules
View File

@ -22,7 +22,7 @@ configure-stamp:
# Add here commands to configure the package.
./autogen.sh
./configure --prefix=/usr
cd libs/pjproject-2.0.1; CFLAGS=-fPIC ./configure
cd libs/pjproject-2.1.0; CFLAGS=-fPIC ./configure
touch configure-stamp
#Architecture
@ -32,7 +32,7 @@ build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
# Add here commands to compile the arch part of the package.
cd libs/pjproject-2.0.1; $(MAKE) dep; $(MAKE) clean; $(MAKE)
cd libs/pjproject-2.1.0; $(MAKE) dep; $(MAKE) clean; $(MAKE)
$(MAKE)
touch $@