Commit d196e022 authored by jfigus's avatar jfigus

Rename binary target to libsrtp2 since it's not backwards compatible with...

Rename binary target to libsrtp2 since it's not backwards compatible with libsrtp 1.x.  Header files are now installed into /usr/local/include/srtp2.
parent 67b9c73e
......@@ -7,8 +7,8 @@
#
# runtest runs test applications
# test builds test applications
# libsrtp.a static library implementing srtp
# libsrtp.so shared library implementing srtp
# libsrtp2.a static library implementing srtp
# libsrtp2.so shared library implementing srtp
# clean removes objects, libs, and executables
# distribution cleans and builds a .tgz
# tags builds etags file from all .c and .h files
......@@ -22,7 +22,7 @@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
all: test
runtest: test
@echo "running libsrtp test applications..."
@echo "running libsrtp2 test applications..."
crypto/test/cipher_driver$(EXE) -v >/dev/null
crypto/test/kernel_driver$(EXE) -v >/dev/null
test/rdbx_driver$(EXE) -v >/dev/null
......@@ -34,7 +34,7 @@ runtest: test
ifeq (1, $(USE_OPENSSL))
cd test; $(abspath $(srcdir))/test/rtpw_test_gcm.sh >/dev/null
endif
@echo "libsrtp test applications passed."
@echo "libsrtp2 test applications passed."
$(MAKE) -C crypto runtest
# makefile variables
......@@ -47,7 +47,7 @@ CFLAGS = @CFLAGS@
LIBS = @LIBS@
LDFLAGS = @LDFLAGS@ -L.
COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS)
SRTPLIB = -lsrtp
SRTPLIB = -lsrtp2
RANLIB = @RANLIB@
INSTALL = @INSTALL@
......@@ -72,7 +72,7 @@ libdir = @libdir@
ifeq (1, $(HAVE_PKG_CONFIG))
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libsrtp.pc
pkgconfig_DATA = libsrtp2.pc
endif
# implicit rules for object files and test apps
......@@ -105,17 +105,17 @@ kernel = crypto/kernel/crypto_kernel.o crypto/kernel/alloc.o \
cryptobj = $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay)
# libsrtp.a (implements srtp processing)
# libsrtp2.a (implements srtp processing)
srtpobj = srtp/srtp.o srtp/ekt.o
libsrtp.a: $(srtpobj) $(cryptobj)
ar cr libsrtp.a $^
$(RANLIB) libsrtp.a
libsrtp2.a: $(srtpobj) $(cryptobj)
ar cr libsrtp2.a $^
$(RANLIB) libsrtp2.a
libsrtp.so: $(srtpobj) $(cryptobj)
$(CC) -shared -Wl,-soname,libsrtp.so \
-o libsrtp.so $^ $(LDFLAGS)
libsrtp2.so: $(srtpobj) $(cryptobj)
$(CC) -shared -Wl,-soname,libsrtp2.so \
-o libsrtp2.so $^ $(LDFLAGS)
# test applications
ifneq (1, $(USE_OPENSSL))
......@@ -135,7 +135,7 @@ ifeq (1, $(HAVE_PCAP))
testapp += test/rtp_decoder$(EXE)
endif
$(testapp): libsrtp.a
$(testapp): libsrtp2.a
test/rtpw$(EXE): test/rtpw.c test/rtp.c test/util.c test/getopt_s.c \
crypto/math/datatypes.c
......@@ -192,41 +192,41 @@ tags:
# documentation - the target libsrtpdoc builds a PDF file documenting
# libsrtp
# libsrtp2
libsrtpdoc:
libsrtp2doc:
$(MAKE) -C doc
.PHONY: clean superclean distclean install
install:
@if [ -r $(DESTDIR)$(includedir)/srtp/srtp.h ]; then \
@if [ -r $(DESTDIR)$(includedir)/srtp2/srtp.h ]; then \
echo "you should run 'make uninstall' first"; exit 1; \
fi
$(INSTALL) -d $(DESTDIR)$(includedir)/srtp
$(INSTALL) -d $(DESTDIR)$(includedir)/srtp2
$(INSTALL) -d $(DESTDIR)$(libdir)
cp $(srcdir)/include/srtp.h $(DESTDIR)$(includedir)/srtp
cp $(srcdir)/include/ekt.h $(DESTDIR)$(includedir)/srtp
cp $(srcdir)/include/rtp.h $(DESTDIR)$(includedir)/srtp
if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
if [ -f libsrtp.so ]; then cp libsrtp.so $(DESTDIR)$(libdir)/; fi
cp $(srcdir)/include/srtp.h $(DESTDIR)$(includedir)/srtp2
cp $(srcdir)/include/ekt.h $(DESTDIR)$(includedir)/srtp2
cp $(srcdir)/include/rtp.h $(DESTDIR)$(includedir)/srtp2
if [ -f libsrtp2.a ]; then cp libsrtp2.a $(DESTDIR)$(libdir)/; fi
if [ -f libsrtp2.so ]; then cp libsrtp2.so $(DESTDIR)$(libdir)/; fi
if [ "$(pkgconfig_DATA)" != "" ]; then \
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir); \
cp $(srcdir)/$(pkgconfig_DATA) $(DESTDIR)$(pkgconfigdir)/; \
fi
uninstall:
rm -f $(DESTDIR)$(includedir)/srtp/*.h
rm -f $(DESTDIR)$(libdir)/libsrtp.a
rm -f $(DESTDIR)$(libdir)/libsrtp.so
-rmdir $(DESTDIR)$(includedir)/srtp
rm -f $(DESTDIR)$(includedir)/srtp2/*.h
rm -f $(DESTDIR)$(libdir)/libsrtp2.a
rm -f $(DESTDIR)$(libdir)/libsrtp2.so
-rmdir $(DESTDIR)$(includedir)/srtp2
if [ "$(pkgconfig_DATA)" != "" ]; then \
rm -f $(DESTDIR)$(pkgconfigdir)/$(pkgconfig_DATA); \
fi
clean:
rm -rf $(cryptobj) $(srtpobj) TAGS \
libsrtp.a libsrtp.so core *.core test/core
libsrtp2.a libsrtp2.so core *.core test/core
for a in * */* */*/*; do \
if [ -f "$$a~" ] ; then rm -f $$a~; fi; \
done;
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libsrtp 2.0.0-pre.
# Generated by GNU Autoconf 2.69 for libsrtp2 2.0.0-pre.
#
# Report bugs to <https://github.com/cisco/libsrtp/issues>.
#
......@@ -578,10 +578,10 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libsrtp'
PACKAGE_TARNAME='libsrtp'
PACKAGE_NAME='libsrtp2'
PACKAGE_TARNAME='libsrtp2'
PACKAGE_VERSION='2.0.0-pre'
PACKAGE_STRING='libsrtp 2.0.0-pre'
PACKAGE_STRING='libsrtp2 2.0.0-pre'
PACKAGE_BUGREPORT='https://github.com/cisco/libsrtp/issues'
PACKAGE_URL=''
......@@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libsrtp 2.0.0-pre to adapt to many kinds of systems.
\`configure' configures libsrtp2 2.0.0-pre to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1298,7 +1298,7 @@ Fine tuning of the installation directories:
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/libsrtp]
--docdir=DIR documentation root [DATAROOTDIR/doc/libsrtp2]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
......@@ -1315,7 +1315,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libsrtp 2.0.0-pre:";;
short | recursive ) echo "Configuration of libsrtp2 2.0.0-pre:";;
esac
cat <<\_ACEOF
......@@ -1406,7 +1406,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libsrtp configure 2.0.0-pre
libsrtp2 configure 2.0.0-pre
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2012,7 +2012,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libsrtp $as_me 2.0.0-pre, which was
It was created by libsrtp2 $as_me 2.0.0-pre, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -5139,7 +5139,7 @@ fi
if test "x$PKG_CONFIG" != "x"; then
HAVE_PKG_CONFIG=1
ac_config_files="$ac_config_files libsrtp.pc"
ac_config_files="$ac_config_files libsrtp2.pc"
else
HAVE_PKG_CONFIG=0
......@@ -5654,7 +5654,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libsrtp $as_me 2.0.0-pre, which was
This file was extended by libsrtp2 $as_me 2.0.0-pre, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -5716,7 +5716,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libsrtp config.status 2.0.0-pre
libsrtp2 config.status 2.0.0-pre
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......@@ -5839,7 +5839,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"crypto/include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS crypto/include/config.h:config_in.h" ;;
"libsrtp.pc") CONFIG_FILES="$CONFIG_FILES libsrtp.pc" ;;
"libsrtp2.pc") CONFIG_FILES="$CONFIG_FILES libsrtp2.pc" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"crypto/Makefile") CONFIG_FILES="$CONFIG_FILES crypto/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
......
dnl Process this file with autoconf to produce a configure script.
AC_INIT([libsrtp], [2.0.0-pre], [https://github.com/cisco/libsrtp/issues])
AC_INIT([libsrtp2], [2.0.0-pre], [https://github.com/cisco/libsrtp/issues])
dnl Must come before AC_PROG_CC
if test -z "$CFLAGS"; then
......@@ -211,7 +211,7 @@ AC_CONFIG_HEADER(crypto/include/config.h:config_in.h)
AC_CHECK_PROG(PKG_CONFIG, pkg-config, yes)
if test "x$PKG_CONFIG" != "x"; then
HAVE_PKG_CONFIG=1
AC_CONFIG_FILES([libsrtp.pc])
AC_CONFIG_FILES([libsrtp2.pc])
else
HAVE_PKG_CONFIG=0
fi
......
......@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
Description: Library for SRTP (Secure Realtime Transport Protocol)
Libs: -L${libdir} -lsrtp @LIBS@
Libs: -L${libdir} -lsrtp2 @LIBS@
Cflags: -I${includedir}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment