summaryrefslogtreecommitdiff
path: root/src/libsputext
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-06 21:38:54 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-06 21:38:54 +0200
commit2839776b4fe1c282f3f2938d52408a51ca6def96 (patch)
treec3fb4489f4b8f5c8c650f772e864984d8c32e50c /src/libsputext
parenta800128f70a60ab7544d4ed4d3bf101c3d1839d2 (diff)
parent6ca146bc0ffc2825402a8fb39b156394a614c1f0 (diff)
downloadxine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.gz
xine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.bz2
Merge changes from main repository.
Diffstat (limited to 'src/libsputext')
-rw-r--r--src/libsputext/Makefile.am10
-rw-r--r--src/libsputext/xine_sputext_decoder.c (renamed from src/libsputext/xine_decoder.c)0
2 files changed, 3 insertions, 7 deletions
diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am
index 362f9319e..5e4ce59d0 100644
--- a/src/libsputext/Makefile.am
+++ b/src/libsputext/Makefile.am
@@ -1,17 +1,13 @@
include $(top_srcdir)/misc/Makefile.common
-libdir = $(XINE_PLUGINDIR)
+AM_LDFLAGS = $(xineplug_ldflags)
-sputext_decoder = xineplug_decode_sputext.la xineplug_dmx_sputext.la
-
-lib_LTLIBRARIES = $(sputext_decoder)
+xineplug_LTLIBRARIES = xineplug_decode_sputext.la xineplug_dmx_sputext.la
xineplug_dmx_sputext_la_SOURCES = demux_sputext.c
xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB)
xineplug_dmx_sputext_la_CFLAGS = $(VISIBILITY_FLAG)
-xineplug_dmx_sputext_la_LDFLAGS = -avoid-version -module
-xineplug_decode_sputext_la_SOURCES = xine_decoder.c
+xineplug_decode_sputext_la_SOURCES = xine_sputext_decoder.c
xineplug_decode_sputext_la_LIBADD = $(XINE_LIB)
xineplug_decode_sputext_la_CFLAGS = $(VISIBILITY_FLAG)
-xineplug_decode_sputext_la_LDFLAGS = -avoid-version -module
diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_sputext_decoder.c
index e8ef631ca..e8ef631ca 100644
--- a/src/libsputext/xine_decoder.c
+++ b/src/libsputext/xine_sputext_decoder.c