summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
author=== Torsten Jager <t.jager@gmx.de>2013-09-20 01:00:39 +0200
committer=== Torsten Jager <t.jager@gmx.de>2013-09-20 01:00:39 +0200
commitb1949cf251e60211d2521647ebbb890e0f68a165 (patch)
tree665094e0ca8f20170e8e7570e72e29a4288690ca /src/input
parent31e23d119f16eec1ed718750c0c871bbfef2d0af (diff)
parent2353ea6726aaad2364d884adaf44c335183dd8e5 (diff)
downloadxine-lib-b1949cf251e60211d2521647ebbb890e0f68a165.tar.gz
xine-lib-b1949cf251e60211d2521647ebbb890e0f68a165.tar.bz2
Merge.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/Makefile.am1
1 files changed, 1 insertions, 0 deletions
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)