From e060ed1f4ce7d54d092dee5dc02a90361e78392c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 6 Jun 2013 00:23:09 +0200
X-Upstream-Status: submitted, waiting for merge
Subject: [PATCH] build: properly use autotools

---
 Makefile.am      |  1 -
 configure.ac     |  5 +++--
 demo/Makefile.am | 18 +++++++++---------
 src/Makefile.am  |  5 +++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index eec516b..046d815 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AUTOMAKE_OPTIONS = no-dependencies dist-shar dist-zip
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh ccrtp.spec ccrtp.spec.in COPYING.addendum \
     ccrtp.list ccrtp.list.in libccrtp.pc libccrtp.pc.in autoconf/* \
diff --git a/configure.ac b/configure.ac
index b5d8a10..5108a20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,8 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AC_INIT(src/ccrtp/rtp.h)
+AC_INIT([ccrtp], [2.0.3])
+AC_CONFIG_SRCDIR([src/ccrtp/rtp.h])
 
 cfg_options=""
 if test -z "$*" ; then
@@ -42,7 +43,7 @@ AC_PROG_CXXCPP
 AC_PROG_CXX
 # OST_PROG_CC_POSIX
 AM_PROG_LIBTOOL
-AM_INIT_AUTOMAKE(ccrtp,[$VERSION])
+AM_INIT_AUTOMAKE([no-dependencies dist-shar dist-zip])
 AM_CONFIG_HEADER(ccrtp-config.h)
 
 AC_C_RESTRICT
diff --git a/demo/Makefile.am b/demo/Makefile.am
index 5e6e3a0..5a11837 100644
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -19,35 +19,35 @@ ccxxincludedir=$(includedir)/cc++
 if SRTP_GCRYPT
 srtp_src = ccsrtptest
 ccsrtptest_SOURCES = ccsrtptest.cpp
-ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
 endif
 
 if SRTP_OPENSSL
 srtp_src = ccsrtptest
 ccsrtptest_SOURCES = ccsrtptest.cpp
-ccsrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+ccsrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
 endif
 
 noinst_PROGRAMS = rtpsend rtplisten rtphello rtpduphello audiorx audiotx \
     ccrtptest $(srtp_src)
 
 rtpsend_SOURCES = rtpsend.cpp
-rtpsend_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtpsend_LDADD = ../src/libccrtp.la @GNULIBS@
 
 rtplisten_SOURCES = rtplisten.cpp
-rtplisten_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtplisten_LDADD = ../src/libccrtp.la @GNULIBS@
 
 rtphello_SOURCES = rtphello.cpp
-rtphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtphello_LDADD = ../src/libccrtp.la @GNULIBS@
 
 rtpduphello_SOURCES = rtpduphello.cpp
-rtpduphello_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+rtpduphello_LDADD = ../src/libccrtp.la @GNULIBS@
 
 audiorx_SOURCES = audiorx.cpp audio.h
-audiorx_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+audiorx_LDADD = ../src/libccrtp.la @GNULIBS@
 
 audiotx_SOURCES = audiotx.cpp
-audiotx_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+audiotx_LDADD = ../src/libccrtp.la @GNULIBS@
 
 ccrtptest_SOURCES = ccrtptest.cpp
-ccrtptest_LDFLAGS = ../src/libccrtp.la @GNULIBS@
+ccrtptest_LDADD = ../src/libccrtp.la @GNULIBS@
diff --git a/src/Makefile.am b/src/Makefile.am
index 58cf4c1..1683a2d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ AM_CXXFLAGS= @WARN_FLAGS@ -I$(top_srcdir)/src/ccrtp
 AM_CPPFLAGS= @WARN_FLAGS@ -I$(top_srcdir)/src/ccrtp
 
 # RELEASE = $(LT_VERSION) -release $(LT_RELEASE)
-RELEASE = --version-info $(LT_VERSION)
+RELEASE = -version-info $(LT_VERSION)
 
 lib_LTLIBRARIES = libccrtp.la
 
@@ -43,6 +43,7 @@ libccrtp_la_SOURCES = rtppkt.cpp rtcppkt.cpp source.cpp data.cpp incqueue.cpp \
     outqueue.cpp queue.cpp control.cpp members.cpp socket.cpp duplex.cpp pool.cpp \
     CryptoContext.cpp CryptoContextCtrl.cpp $(srtp_src_g) $(srtp_src_o) $(skein_srcs)
 
-libccrtp_la_LDFLAGS = $(RELEASE) @GNULIBS@
+libccrtp_la_LDFLAGS = $(RELEASE)
+libccrtp_la_LIBADD = @GNULIBS@
 
 noinst_HEADERS = private.h
-- 
1.8.2