summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDarren Salt <devspam@moreofthesa.me.uk>2013-09-18 13:16:40 +0100
committerDarren Salt <devspam@moreofthesa.me.uk>2013-09-18 13:16:40 +0100
commit4c6876c9ebbaa7e793219d20a8528d939149563d (patch)
tree36be983a925bbec61943f3dcbce7d128ce6b2154 /src
parent6ae7122ab3014b296f066aefbbc7aab2051fcf53 (diff)
downloadxine-lib-4c6876c9ebbaa7e793219d20a8528d939149563d.tar.gz
xine-lib-4c6876c9ebbaa7e793219d20a8528d939149563d.tar.bz2
Avoid using deprecated autoconf & automake features.
asfheader.c is used in two places: same compiler flags, so is safe.
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/Makefile.am2
-rw-r--r--src/input/Makefile.am1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 32b5616f7..1f7948fdb 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -84,6 +84,8 @@ xineplug_dmx_qt_la_SOURCES = demux_qt.c
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
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 804b36352..3752d4c9b 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -103,6 +103,7 @@ xineplug_inp_dvd_la_CFLAGS = $(AM_CFLAGS) $(DVD_CFLAGS)
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)