[xine-cvs] HG: xine-lib-1.2: Avoid using deprecated autoconf & automake features.

[Darren S. <de...@mo...>]

# HG changeset patch
# User Darren Salt <de...@mo...>
# Date 1379506600 -3600
# Node ID 7ef4ab69e181fdd251402e1832fa4d8da6e45631
# Branch  default
# Parent  09bb8a9a9c77e03d51203df9aadf14aa41e76e22
Avoid using deprecated autoconf & automake features.

asfheader.c is used in two places: same compiler flags, so is safe.

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@
 
 dnl Initialize autoconf, autoheader, and automake
 AC_INIT([xine-lib], XINE_VERSION_SPEC, [xin...@li...])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_SRCDIR([src/xine-engine/xine.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_LIBOBJ_DIR([lib])
@@ -543,7 +543,7 @@
         esac
 
         if test "$WIN32_SYS" = "mingw32"; then
-            WIN32_INCLUDES='-I$(top_srcdir)/win32/include'
+            WIN32_AM_CPPFLAGS='-I$(top_srcdir)/win32/include'
             LIBS="-lwinmm -lwsock32 $LIBS"
             LDFLAGS="-Wl,--enable-stdcall-fixup $LDFLAGS"
             dnl iberty has been needed only in older versions
@@ -1140,8 +1140,8 @@
 dnl some include paths ( !!! DO NOT REMOVE !!! )
 dnl ---------------------------------------------
 
-INCLUDES='-I$(top_srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-engine -I$(top_srcdir)/src/xine-utils $(INTLDIR) -I$(top_builddir)/src/input -I$(top_srcdir)/src/input $(WIN32_INCLUDES) -I$(top_builddir)/lib -I$(top_srcdir)/lib'
-AC_SUBST(INCLUDES)
+AM_CPPFLAGS='-I$(top_srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-engine -I$(top_srcdir)/src/xine-utils $(INTLDIR) -I$(top_builddir)/src/input -I$(top_srcdir)/src/input $(WIN32_AM_CPPFLAGS) -I$(top_builddir)/lib -I$(top_srcdir)/lib'
+AC_SUBST(AM_CPPFLAGS)
 
 dnl We check for warnings here rather than with optimisations since we
 dnl want them to be _always_ enabled, to make sure the code is sane
 --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -84,6 +84,8 @@
 xineplug_dmx_qt_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(ZLIB_LIBS)
 xineplug_dmx_qt_la_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
 
+# note: asfheader.c also used from ../input
+# is safe given same compiler options
 xineplug_dmx_asf_la_SOURCES = demux_asf.c asfheader.c
 xineplug_dmx_asf_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(LTLIBICONV)
 xineplug_dmx_asf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
 --git a/src/input/Makefile.am b/src/input/Makefile.am
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -103,6 +103,7 @@
 xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c
 xineplug_inp_net_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL)
 
+# note: compiling ../demuxers/asfheader.c here is safe given same compiler options
 xineplug_inp_mms_la_SOURCES = input_mms.c net_buf_ctrl.c mms.c mmsh.c http_helper.c ../demuxers/asfheader.c
 xineplug_inp_mms_la_LIBADD = $(XINE_LIB) $(LTLIBICONV) $(PTHREAD_LIBS) $(LTLIBINTL)