Commit 4448148a authored by Yann Diorcet's avatar Yann Diorcet

Fix autotool warnings

parent 07e0e720
......@@ -44,7 +44,7 @@ echo "Generating build scripts in mediastreamer..."
set -x
$libtoolize --copy --force
$INTLTOOLIZE --copy --force --automake
$ACLOCAL $ACLOCAL_ARGS
$ACLOCAL -I m4 $ACLOCAL_ARGS
autoheader
$AUTOMAKE --force-missing --add-missing --copy
autoconf
......@@ -33,6 +33,7 @@ AC_MSG_RESULT([Building Package on ${OS}])
AM_INIT_AUTOMAKE([tar-ustar])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
AC_SUBST([docdir], [${datadir}/doc])
AC_CONFIG_HEADERS(mediastreamer-config.h)
AC_DEFINE_UNQUOTED(MEDIASTREAMER_MAJOR_VERSION,$MEDIASTREAMER_MAJOR_VERSION, [major version])
AC_DEFINE_UNQUOTED(MEDIASTREAMER_MINOR_VERSION,$MEDIASTREAMER_MINOR_VERSION, [minor version])
......@@ -41,8 +42,6 @@ AC_DEFINE_UNQUOTED(MEDIASTREAMER_VERSION,"$MEDIASTREAMER_VERSION",[MEDIASTREAMER
MS_PUBLIC_CFLAGS=
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=no)])],
......@@ -182,12 +181,13 @@ IT_PROG_INTLTOOL([0.40], [no-xml])
GETTEXT_PACKAGE="mediastreamer"
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,["mediastreamer"],[name of the gettext domain. Used in the call to 'bindtextdomain()'])
AC_SUBST([GETTEXT_PACKAGE])
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[name of the gettext domain. Used in the call to 'bindtextdomain()'])
if test "$mingw_found" != "yes" ; then
dnl gettext macro does not work properly under mingw. And we want to use the one provided by GTK.
CPPFLAGS_save=$CPPFLAGS
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.18])
CPPFLAGS=$CPPFLAGS_save
LIBS="$LIBS $LIBINTL"
else
AC_DEFINE(ENABLE_NLS,1,[Tells whether localisation is possible])
......
......@@ -8,15 +8,14 @@ SOURCES=$(DOXFILES) $(top_srcdir)/include/mediastreamer2/*.h $(top_srcdir)/src/*
#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)/help/doc/html/html.tar
$(doc_html_DATA): $(top_builddir)/help/doc/html/index.html
cd $(<D) && tar cf html.tar *
cd $(top_builddir)/help/doc/html/ && tar cf html.tar *
$(top_builddir)/help/doc/html/index.html: $(SOURCES) Doxyfile Makefile.am
rm -rf doc
......
This diff is collapsed.
AC_DEFUN([AM_PROG_MKDIR_P], [AC_PROG_MKDIR_P([$@])])
This diff is collapsed.
......@@ -19,8 +19,6 @@ BUILT_SOURCES=basedescs.h $(GITVERSION_FILE) yuv2rgb.fs.h yuv2rgb.vs.h
CLEANFILES=basedescs.h voipdescs.h basedescs.txt voipdescs.txt $(GITVERSION_FILE) yuv2rgb.fs.h yuv2rgb.vs.h
INCLUDES=-I$(top_srcdir)/include/
lib_LTLIBRARIES=libmediastreamer_base.la
if BUILD_VOIP_LIBRARY
lib_LTLIBRARIES+=libmediastreamer_voip.la
......@@ -252,19 +250,23 @@ if BUILD_WIN32_WCE
libmediastreamer_base_la_LIBADD+= -lmmtimer
endif
AM_CFLAGS= $(ORTP_CFLAGS) \
$(SPEEX_CFLAGS) \
$(GSM_CFLAGS) \
$(STRICT_OPTIONS) \
$(LIBPULSE_CFLAGS) \
$(SPANDSP_CFLAGS) \
$(MSSILK_CFLAGS) \
$(PCAP_CFLAGS)
AM_CPPFLAGS=\
-I$(top_srcdir)/include/
AM_CFLAGS=\
$(STRICT_OPTIONS) \
$(ORTP_CFLAGS) \
$(SPEEX_CFLAGS) \
$(GSM_CFLAGS) \
$(STRICT_OPTIONS) \
$(LIBPULSE_CFLAGS) \
$(SPANDSP_CFLAGS) \
$(MSSILK_CFLAGS) \
$(PCAP_CFLAGS)
AM_CXXFLAGS= $(ORTP_CFLAGS) \
$(STRICT_OPTIONS)
AM_CXXFLAGS=\
$(STRICT_OPTIONS) \
$(ORTP_CFLAGS)
DEFS=@DEFS@ -DPACKAGE_PLUGINS_DIR=\"$(PACKAGE_PLUGINS_DIR)\" -DLOCALEDIR=\"$(localedir)\" -DMS2_INTERNAL
......
......@@ -71,12 +71,19 @@ endif ORTP_ENABLED
LDADD=$(TEST_DEPLIBS)
INCLUDES=-I$(top_srcdir)/include/
AM_CPPFLAGS=\
-I$(top_srcdir)/include/
if !ORTP_ENABLED
INCLUDES+=-I$(top_srcdir)/src/ortp-deps/
AM_CPPFLAGS+=-I$(top_srcdir)/src/ortp-deps/
endif
AM_CFLAGS=$(ORTP_CFLAGS) $(STRICT_OPTIONS) $(VIDEO_CFLAGS) $(PCAP_CFLAGS)
AM_CFLAGS=\
$(ORTP_CFLAGS) \
$(STRICT_OPTIONS) \
$(VIDEO_CFLAGS) \
$(PCAP_CFLAGS)
AM_LDFLAGS=-export-dynamic
endif
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