Commit 1b449a34 authored by Yann Diorcet's avatar Yann Diorcet

Fix autotool warnings

parent 0d318ef4
......@@ -16,15 +16,14 @@ CLEANFILES=
#html doc
if HAVE_DOXYGEN
# doxdir & pkgdocdir are not always defined by automake
docdir=$(datadir)/doc
# docdir & pkgdocdir are not always defined by automake
pkgdocdir=$(docdir)/$(PACKAGE)-$(VERSION)
doc_htmldir=$(pkgdocdir)/html
doc_html_DATA = $(top_builddir)/doc/html/html.tar
$(doc_html_DATA): $(top_builddir)/doc/html/index.html
cd $(<D) && tar cf html.tar *
cd $(top_builddir)/doc/html/ && tar cf html.tar *
$(top_builddir)/doc/html/index.html: $(SOURCES) ortp.doxygen Makefile.am
rm -rf doc
......@@ -56,8 +55,8 @@ if WITH_EPM
.PHONY: package
PKG_NAME = $(PACKAGE)-$(VERSION)-$(RELEASE)
BUILDROOT = $(shell pwd)/epm-install
PKG_NAME=$(PACKAGE)-$(VERSION)-$(RELEASE)
BUILDROOT=`pwd`/epm-install
package: $(srcdir)/pkg.list $(srcdir)/configure
-rm -rf pkg $(BUILDROOT) $(PKG_NAME).*
......
......@@ -34,7 +34,7 @@ fi
set -x
rm -rf config.cache autom4te.cache
$libtoolize --copy --force
$ACLOCAL $ACLOCAL_ARGS
$ACLOCAL -I m4 $ACLOCAL_ARGS
autoheader
$AUTOMAKE --force-missing --add-missing --copy
autoconf
......
......@@ -30,6 +30,7 @@ PACKAGE=ortp
AM_INIT_AUTOMAKE([tar-ustar])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
AC_SUBST([docdir], [${datadir}/doc])
AC_CONFIG_HEADERS(ortp-config.h)
AC_CONFIG_MACRO_DIR([m4])
AC_DEFINE_UNQUOTED(ORTP_MAJOR_VERSION,$ORTP_MAJOR_VERSION, [major version])
......@@ -41,8 +42,6 @@ dnl Checks for programs.
AC_PROG_CC
LT_INIT([win32-dll shared disable-static])
AC_SUBST([mkdir_p])
AC_MSG_CHECKING([warning make an error on compilation])
AC_ARG_ENABLE(strict,
[AS_HELP_STRING([--enable-strict], [Enable error on compilation warning (default=yes)])],
......
AC_DEFUN([AM_PROG_MKDIR_P], [AC_PROG_MKDIR_P([$@])])
EXTRA_DIST=ortp-config-win32.h dll_entry.c master system
AM_CFLAGS= $(PTHREAD_CFLAGS) -I$(top_srcdir) $(TRUESPEECH_CFLAGS) $(SRTP_CFLAGS)
AM_LDFLAGS= $(PTHREAD_LDFLAGS)
AM_CPPFLAGS=\
-I$(top_srcdir)/include/ \
-I$(top_srcdir)
INCLUDES=-I$(top_srcdir)/include/
AM_CFLAGS=\
$(PTHREAD_CFLAGS) \
$(TRUESPEECH_CFLAGS) \
$(SRTP_CFLAGS)
AM_LDFLAGS=$(PTHREAD_LDFLAGS)
lib_LTLIBRARIES = libortp.la
......
......@@ -2,31 +2,31 @@ SUBDIRS=win_receiver win_sender
if ENABLE_TESTS
noinst_PROGRAMS= rtpsend rtprecv mrtpsend mrtprecv test_timer rtpmemtest tevrtpsend tevrtprecv tevmrtprecv rtpsend_stupid
noinst_PROGRAMS=rtpsend rtprecv mrtpsend mrtprecv test_timer rtpmemtest tevrtpsend tevrtprecv tevmrtprecv rtpsend_stupid
rtpsend_SOURCES= rtpsend.c
rtpsend_SOURCES=rtpsend.c
rtprecv_SOURCES= rtprecv.c
rtprecv_SOURCES=rtprecv.c
mrtpsend_SOURCES= mrtpsend.c
mrtpsend_SOURCES=mrtpsend.c
mrtprecv_SOURCES= mrtprecv.c
mrtprecv_SOURCES=mrtprecv.c
rtpmemtest_SOURCES= rtpmemtest.c
rtpmemtest_SOURCES=rtpmemtest.c
test_timer_SOURCES= test_timer.c
test_timer_SOURCES=test_timer.c
tevrtpsend_SOURCES= tevrtpsend.c
tevrtpsend_SOURCES=tevrtpsend.c
tevrtprecv_SOURCES= tevrtprecv.c
tevrtprecv_SOURCES=tevrtprecv.c
tevmrtprecv_SOURCES= tevmrtprecv.c
tevmrtprecv_SOURCES=tevmrtprecv.c
rtpsend_stupid_SOURCES=rtpsend_stupid.c
endif
AM_CFLAGS= -D_ORTP_SOURCE $(PTHREAD_CFLAGS)
AM_LDFLAGS= $(PTHREAD_LDFLAGS)
LDADD=$(top_builddir)/src/libortp.la $(SRTP_LIBS) $(SSL_LIBS) $(LIBZRTPCPP_LIBS)
INCLUDES=-I$(top_srcdir)/include/
AM_CPPFLAGS=-I$(top_srcdir)/include/
AM_CFLAGS=-D_ORTP_SOURCE $(PTHREAD_CFLAGS)
AM_LDFLAGS=$(PTHREAD_LDFLAGS)
LDADD=$(top_builddir)/src/libortp.la $(SRTP_LIBS) $(SSL_LIBS) $(LIBZRTPCPP_LIBS)
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