← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linphone/quantal

« back to all changes in this revision

Viewing changes to oRTP/src/tests/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Elie Mamane, Kilian Krause, Lionel Elie Mamane
  • Date: 2009-05-27 11:39:51 UTC
  • mfrom: (5.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090527113951-jd525e5rlwluh617
http://bugs.debian.org/528076
[ Kilian Krause ]
* Remove -N from wget args in get-orig-source target as -O is already
  used.

[ Lionel Elie Mamane ]
* linphone: Fix file conflict with linphone-common (<= 3.1.2-1)
  (Closes: #528076)

Show diffs side-by-side

added added

removed removed

Lines of Context:
oRTP/src/tests/Makefile.am
24
24
 
25
25
AM_CFLAGS=  -D_ORTP_SOURCE $(PTHREAD_CFLAGS) 
26
26
AM_LDFLAGS= $(PTHREAD_LDFLAGS)
27
 
LDADD=$(top_builddir)/src/libortp.la  $(SRTP_LIBS)
 
27
LDADD=$(top_builddir)/src/libortp.la  $(SRTP_LIBS) $(SSL_LIBS)
28
28
INCLUDES=-I$(top_srcdir)/include/