Skip to content
Snippets Groups Projects
Commit eeddc4d4 authored by pierre-luc's avatar pierre-luc
Browse files

Merge branch 'master' of...

parents 89ce9af2 ce3255c6
No related branches found
No related tags found
No related merge requests found
0.9.6 0.9.7~beta
...@@ -26,6 +26,6 @@ indent: ...@@ -26,6 +26,6 @@ indent:
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libs src ringtones man $(TESTS_DIR) SUBDIRS = libs src ringtones man #$(TESTS_DIR)
EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
0.9.6 0.9.7~beta
...@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59 ...@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
dnl dnl
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([SFLphone],[0.9.6~rc1],[sflphoneteam@savoirfairelinux.com],[sflphone]) AC_INIT([SFLphone],[0.9.7~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]]) AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
AC_REVISION([$Revision$]) AC_REVISION([$Revision$])
......
...@@ -6,20 +6,20 @@ OBJECT_FILES= \ ...@@ -6,20 +6,20 @@ OBJECT_FILES= \
../src/sflphoned-managerimpl.o \ ../src/sflphoned-managerimpl.o \
../src/sflphoned-accountcreator.o \ ../src/sflphoned-accountcreator.o \
../src/sflphoned-call.o \ ../src/sflphoned-call.o \
../src/sflphoned-sipcall.o \ ../src/sip/sipcall.o \
../src/sflphoned-iaxcall.o \ ../src/iax/libiaxlink_la-iaxcall.o \
../src/sflphoned-voiplink.o \ ../src/sflphoned-voiplink.o \
../src/sflphoned-sipvoiplink.o \ ../src/sip/sipvoiplink.o \
../src/sflphoned-iaxvoiplink.o \ ../src/iax/libiaxlink_la-iaxvoiplink.o \
../src/sflphoned-account.o \ ../src/sflphoned-account.o \
../src/sflphoned-sipaccount.o \ ../src/sip/sipaccount.o \
../src/sflphoned-iaxaccount.o \ ../src/iax/libiaxlink_la-iaxaccount.o \
../src/sflphoned-eventthread.o \ ../src/sflphoned-eventthread.o \
../src/plug-in/pluginmanager.o \ ../src/plug-in/pluginmanager.o \
../src/plug-in/audiorecorder/audiorecord.o \ ../src/plug-in/audiorecorder/audiorecord.o \
../src/sflphoned-samplerateconverter.o \ ../src/audio/samplerateconverter.o \
../src/sflphoned-sdp.o \ ../src/sip/sdp.o \
../src/sflphoned-sdpmedia.o \ ../src/sip/sdpmedia.o \
../src/sflphoned-numbercleaner.o \ ../src/sflphoned-numbercleaner.o \
../src/history/historymanager.o ../src/history/historymanager.o
...@@ -38,6 +38,8 @@ numbercleanerTester_LDADD = \ ...@@ -38,6 +38,8 @@ numbercleanerTester_LDADD = \
@CCGNU2_LIBS@ \ @CCGNU2_LIBS@ \
@CCRTP_LIBS@ \ @CCRTP_LIBS@ \
@SAMPLERATE_LIBS@ \ @SAMPLERATE_LIBS@ \
@ZRTPCPP_LIBS@ \
@libssl_LIBS@ \
$(PJSIP_LIBS) \ $(PJSIP_LIBS) \
-luuid \ -luuid \
$(OBJECT_FILES) $(OBJECT_FILES)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment